Merge origin/master

Conflicts:
	src/Templo/TemploBundle/Resources/views/base.html.twig
Merge origin/master

Conflicts:
	composer.json
	src/Templo/TemploBundle/Controller/AdvertisementController.php
	src/Templo/TemploBundle/Form/InmuebleType.php
	src/Templo/TemploBundle/Form/PisoType.php
	src/Templo/TemploBundle/Resources/public/js/publish/publish-common.js
	src/Templo/TemploBundle/Resources/public/js/publish/publish-flat.js
	src/Templo/TemploBundle/Resources/translations/messages.es.yml
	src/Templo/TemploBundle/Resources/views/Advertisement/advertisementCreateLinks.html.twig
	src/Templo/TemploBundle/Resources/views/Advertisement/wizard/flatWizard.html.twig
	src/Templo/TemploBundle/Resources/views/base.html.twig
	src/Templo/TemploBundle/Resources/views/includes/menu.html.twig
	src/Templo/UserBundle/Resources/public/less/user.less