controllers.py trimming & create some.py

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

re-import
Merge remote-tracking branch 'origin/master'
controllers.py trimming & create some.py

re-import