- edits to manifest
Merge branch 'UberMaster' of
https://github.com/Cletus-Doy-Shinda/SDAP1.git into UberMaster

Conflicts:
	SDAP1/AndroidManifest.xml
	SDAP1/res/values/strings.xml
	
- Addition of preferences