Cleaning up merger problems
Merge branch 'local_store' of
https://github.com/CardioVascular-Research-Group/physionet-analysis-service.git
into local_store

Conflicts:
	src/edu/jhu/cvrg/services/physionetAnalysisService/wrapper/Chesnokov1ApplicationWrapper.java