map services
Merge branch 'master' of https://github.com/tsuxia/LetUs.git

Conflicts:
	LetUs/LetUs/.settings/com.google.appengine.eclipse.core.prefs
	LetUs/LetUs/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	LetUs/LetUs/war/WEB-INF/appengine-generated/local_db.bin
	LetUs/LetUs/war/WEB-INF/jsp/manageActivity.jsp
	LetUs/LetUs/war/WEB-INF/jsp/userPage.jsp