test
Merge branch 'master' of https://github.com/OnTheSpotTeam/OnTheSpot1
into Richard

Conflicts:
	src/com/swat/onthespot/ItinMapFragment.java
Fixed invalid file saves.
some changes
something