refactored
Merge branch 'master' of github.com:maloi/iapp-admin