Flexible map locations WIP
Merging

Conflicts:
	RECRUTRAK5000/src/com/example/recrutrak5000/MapViewActivity.java