Controller stuff
Merge branch 'master' of github.com:sheeep/lukreativ2014