Changed blocks in templates
Merge branch 'dev.admin-ui' into dev.admin

Conflicts:
	apenads/handlers/admin/templates/main.html
	apenads/handlers/admin/templates/start.html
	apenads/handlers/admin/templates/user.html