Fixed import of UUIDModel
Reverted change to model mixins inheritance
Merge branch 'develop' of https://github.com/prjts/open-muni into develop

Conflicts:
	omuni/accounts/models.py
	omuni/commons/mixins/models.py