try to pull
getPlaceInfo
Merge branch 'master' of https://github.com/basdag/service.git

Conflicts:
	src/com/cmu/controller/USCBAction.java