2014/7/11 by linhu
Merge branch 'master' of github.com:linhu3/CommunityPython into linhu3-master

Conflicts:
	code/handler/CheckrelativesHandler.py
Merge branch 'linhu3-master'