Change controllers
Merge branch 'master' of https://github.com/kirkazan/itis-2014-spring