cleaned up controllers
Merge branch 'development'