#55
Merge branch 'topic_auth' into dev

Conflicts:
	myhoard/apps/collections/models.py
	myhoard/apps/collections/views.py
	myhoard/apps/common/decorators.py
	myhoard/settings/common.py