Initial commit
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/controller/MainControl.js
	phonegap/platforms/android/CordovaLib/bin/build.prop
	phonegap/platforms/android/CordovaLib/bin/classes.jar
	phonegap/platforms/android/assets/www/app.js
	phonegap/platforms/android/bin/build.prop
	phonegap/platforms/android/bin/classes.dex
	phonegap/platforms/android/bin/webInspect-debug-unaligned.apk
	phonegap/platforms/android/bin/webInspect-debug.apk
	phonegap/platforms/android/bin/webInspect.ap_
	phonegap/platforms/android/bin/webInspect.ap_.d
	phonegap/www/app.js
Merge remote-tracking branch 'origin/master