refactoring controler
Merge branch 'develop' of github.com:mibto/mez into develop
Merge branch 'develop' of github.com:mibto/mez into develop
everything changed
Merge branch 'develop' of github.com:mibto/mez into develop