[enme ci] Automated branch merge (from 1.5.x:47731d3dc0fc9e170e9929964eb4bdc7686bb945)
[enme ci] Automated branch merge (from 1.5.x:d9f7a16f996d8864d528e7c30850901a520b1d2d)
[enme ci] Automated branch merge (from 1.5.x:4e976e539609b01a9b25f822fe79f99a1a44bece)
Merge branch '1.5.x' of github.com:encuestame/encuestame into 1.5.x
Merge branch 'master' of github.com:encuestame/encuestame into 1.5.x
[enme ci] Automated branch merge (from 1.5.x:71b3e2f9ae7a81aaff188e93982aca16c26886ab)
Merge pull request #26 from encuestame/1.5.x

Merge pull request #25 from dianmorales/1.5.x
Merge branch '1.5.x' of github.com:encuestame/encuestame into 1.5.x
Merge branch '1.5.x' of github.com:encuestame/encuestame
Merge branch 'master' of github.com:juanpicado/encuestame

# Via Encuestame CI
* 'master' of github.com:juanpicado/encuestame:

Conflicts:
	enme-css/src/css/resource/sass
	enme-js/resources-enme-war/src/main/resources/resource/js/me
Merge branch '1.5.x' of github.com:juanpicado/encuestame

* '1.5.x' of github.com:juanpicado/encuestame:
  Updated submodule
  ENCUESTAME-663 Updated service to provided the embebed code
Merge branch 'master' of github.com:dianmorales/encuestame

# By Encuestame CI
# Via Encuestame CI (2) and Diana Morales (1)
* 'master' of github.com:dianmorales/encuestame:
  [enme ci] Automated branch merge (from 1.5.x:4e976e539609b01a9b25f822fe79f99a1a44bece)

Conflicts:
	enme-css/src/css/resource/sass
	enme-js/resources-enme-war/src/main/resources/resource/js/me
Merge branch '1.5.x' of github.com:dianmorales/encuestame

# Via Diana Morales
* '1.5.x' of github.com:dianmorales/encuestame: