Got Parse to work
Merge branch 'samson' of https://github.com/OPUSNYC/opus_dopusNYC

Conflicts:
	development/android/AndroidManifest.xml
	development/android/assets/app_config.json
	development/android/assets/forge/app_config.js
	development/android/assets/hash_to_file.json
	development/android/assets/src/js/main.js
	development/reload/src/js/main.js
	src/js/main.js