Fixes
Fixes and Cleanup

Conflicts:
	res/values/axxion_strings.xml

Conflicts:
	res/values/axxion_strings.xml
	res/values/cm_strings.xml