Bring in Profiles support from mr0

Change-Id: Icae838838ce2c34aec22c50f166b957205db8394

Conflicts:
	res/layout/preference_icon.xml
	res/values/strings.xml
	res/xml/settings_headers.xml
add KaosDroid extras
fix issues