texts mereth aderthad section
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/index.html
	src/webapp/plain_pages/templates/webapp/plain_pages/merethaderthad_comoparticipar.html
	src/webapp/plain_pages/templates/webapp/plain_pages/merethaderthad_modelo.html
	src/webapp/plain_pages/templates/webapp/plain_pages/merethaderthad_premios.html
	src/webapp/plain_pages/templates/webapp/plain_pages/participantes.html
Merge branch 'Erengalad-master'