refactored controllers a bit, preparing for AI controllers
Merge remote-tracking branch 'origin/dev' into dev