ver #40. Fixed mergeMashup selenium test. Left make some checks because 'to merge mashup' dont work well.
ver #40. Fixed mergeMashup selenium test. Left make some checks because 'to merge mashup' dont work well.

rockneurotiko/wirecloud,rockneurotiko/wirecloud,rockneurotiko/wirecloud,jpajuelo/wirecloud,jpajuelo/wirecloud,jpajuelo/wirecloud,rockneurotiko/wirecloud,jpajuelo/wirecloud