label style update
Merge remote-tracking branch 'origin/master' into muer_rest

Conflicts:
	forum/static/css/mystyle.css
	forum/templates/index.html