edit UI
Merge branch 'master' of https://github.com/brightja/hazzard

Conflicts:
	app/views.py