Gui update
Merge branch 'master' of https://github.com/austinsims/commonplace

Conflicts:
	sep/commonplace/templates/commonplace/base.html
	sep/sep/db.sqlite3