ticket:8 Css layout
Merge branch 't_8_edit_in_admin'

Conflicts:
	hello42/hello/templates/hello/home.html