Fixed last issues SettingsActivity, improved mock CustomerSupportActivity
Merge branch 'marketplace' of https://github.com/00stefan00/ITACT_GetConnected into marketplace