Merge branch 'release/1.0'
cambios y fixes
cambios otra vez
finalizado ajustes
Merge branch 'hotfix/1.1' into develop

Conflicts:
	css/author.css
	css/author.less
	home-body.html
	img/bg_marcas.gif
	img/bg_marcas_int.gif
	negocios.xml