added settings activity
Merge branch 'master' of https://github.com/c0mpas/MobileAppDevelopment.git