controllers.py trimming & create some.py

re-import
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/controllers.py
	apps/core/model/models.py
controllers.py trimming & create some.py

re-import
controllers.py trimming & create some.py

re-import