Merged
Merge ibranch 'master' of https://github.com/chunqishi/lapps

Conflicts:
	edu.brandeis.cs.template-web-service/src/main/resource/lapps_common_io.pyc
Merge branch 'master' of https://github.com/chunqishi/lapps