committing my changes
added launching the Settings Activity
added settings strings
added defs for settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/BillRothVMware/bora-strata-mar27.git