New UI merge in progress
Merge branch 'dev' of github.com:gogits/gogs into dev

Conflicts:
	templates/status/500.tmpl
Huge updates!!!!! Be careful to merge!!!!