Updates to controllers
Merge branch 'master' of https://github.com/jkoisch/main_street_station