Done converting address to point on maps.
Merge branch 'master' into fullFront

Conflicts:
	TestAppEngineProject/war/WEB-INF/appengine-generated/local_db.bin