changes to new setup
Merge branch 'master' of https://github.com/savveo/cmgr

Conflicts:
	templates/base.html