Project.Properties Issues
Merge branch 'working' of https://github.com/CrossIan/GeoBook into working

Conflicts:
	project.properties
Changed the look of the settings page and added the option to select
different colors and change the profile name. Still needs to be
implemented.
Merge branch 'working' of https://github.com/CrossIan/GeoBook into working

Conflicts:
	project.properties
	res/values/strings.xml