updateLocation
Merge branch 'master' of https://github.com/liyaguang/PalHunterServer

Conflicts:
	src/edu/usc/palhunter/apis/APITest.java
	src/edu/usc/palhunter/business/TrajectoryManager.java
	src/edu/usc/palhunter/business/UserManager.java