frontend patch
Merge remote-tracking branch 'origin/master'

Conflicts:
	UPunk/views/base.html
ok