Texts (About us & theme)
Texts About us smials
Merge branch 'master' of https://github.com/Erengalad/estelcon_web

Conflicts:
	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_bibliografia.html
	src/webapp/plain_pages/templates/webapp/plain_pages/tematica_influencia.html