Change font size and working SettingsActivity
Added Values nl
Merge conflicts solved
Merge branch 'marketplace' of https://github.com/00stefan00/ITACT_GetConnected into marketplace