Program the prices policy
Merge pull request #5 from Erengalad/master

wrapper background changed
Add quota increment to non-members
Fix layout of dynamic pages
Review some styles
Fix all boxed-second blocks
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
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'
Merge branch 'master' of github.com:Erengalad/estelcon_web into Erengalad-master

Conflicts:
	src/webapp/plain_pages/templates/webapp/plain_pages/cuestionespracticas.html
	src/webapp/plain_pages/templates/webapp/plain_pages/cuestionespracticas_comollegar.html
	src/webapp/plain_pages/templates/webapp/plain_pages/cuestionespracticas_consejos.html
	src/webapp/plain_pages/templates/webapp/plain_pages/cuestionespracticas_contacto.html
	src/webapp/plain_pages/templates/webapp/plain_pages/cuestionespracticas_lugar.html
	src/webapp/plain_pages/templates/webapp/plain_pages/english.html
	src/webapp/plain_pages/templates/webapp/plain_pages/index.html
Merge branch 'Erengalad-master'
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'
Change bank account number
Merge pull request #2 from hirunatan/master

last changes