proper controller setup for development
merge
Merge branch 'master' into develop