bunches of work.
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/core/models/__init__.py