refactoring controllers
Merge branch 'master' of github.com:diredevs/buse