Merge pull request #1 from Erengalad/master

Boxed padding changed
Update user profile with more fields
Merge pull request #2 from Erengalad/master

Boxed bottom padding changed
Fix boxed blocks on left sidebar
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'
Merge pull request #1 from hirunatan/master

Syncronize upstream