Finished Java
Test Python
Merge branch 'master' of https://github.com/chunqishi/lapps

Conflicts:
	edu.brandeis.cs.template-web-service/src/main/java/edu/brandeis/cs/python/utils/JIniFile.java
	edu.brandeis.cs.template-web-service/src/main/java/edu/brandeis/cs/python/utils/PythonRunner.java
	edu.brandeis.cs.template-web-service/src/main/resource/lapps.conf
	edu.brandeis.cs.template-web-service/src/main/resource/lapps_common_io.py