Very last changes on texts
Merge branch 'master' of github.com:Erengalad/estelcon_web into Erengalad-master

Conflicts:
	src/webapp/plain_pages/templates/webapp/plain_pages/asistentes.html
	src/webapp/plain_pages/templates/webapp/plain_pages/curiosos.html
	src/webapp/plain_pages/templates/webapp/plain_pages/participantes.html
	src/webapp/plain_pages/templates/webapp/plain_pages/sobrenosotros.html
	src/webapp/plain_pages/templates/webapp/plain_pages/sobrenosotros_hammo.html
	src/webapp/plain_pages/templates/webapp/plain_pages/sobrenosotros_merithaderthad.html
	src/webapp/plain_pages/templates/webapp/plain_pages/sobrenosotros_ste.html
	src/webapp/plain_pages/templates/webapp/plain_pages/tematica_descargas.html
	src/webapp/plain_pages/templates/webapp/plain_pages/tematica_influencia.html
Merge branch 'Erengalad-master'