Fixed null pointer exception cases
Merge branch 'development' of https://github.com/omnipos/OmniPOSDesktop into development
Added user type