Adding specific client location list display stuff
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git

Conflicts:
	DesignProject/AndroidManifest.xml