ui design
Merge remote-tracking branch 'origin/master'

Conflicts:
	models.pyc
	template/index.html
	urls.pyc
	views.pyc