Boxed contents created
Capitalize deleted in list1
Merge branch 'master' of github.com:Erengalad/estelcon_web into Erengalad-master

Conflicts:
	src/webapp/plain_pages/templates/webapp/plain_pages/index.html
Merge branch 'Erengalad-master'