Taking config files out of version control.
Merge branch 'master' of https://github.com/nearchos/uclan-tch

Conflicts:
	.idea/workspace.xml
Version 1.1 of Android app and full support for indoors location by both Android and App Engine Server.