fixed Settings Title
Merge branch 'nextTry' of github.com:azapps/mirakel-android into nextTry
Merge branch 'nextTry' of github.com:azapps/mirakel-android into nextTry

Conflicts:
	AndroidManifest.xml