refactoring some classes
Merge branch 'master' of https://github.com/livarb/uibmobilapp