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

Conflicts:
	.idea/workspace.xml
	phonegap/platforms/android/CordovaLib/bin/build.prop
	phonegap/platforms/android/CordovaLib/bin/classes.jar
	phonegap/platforms/android/bin/build.prop
	phonegap/platforms/android/bin/dexedLibs/classes-20eb8a2f98c3f21e28cd8e02d84ee8df.jar
	phonegap/platforms/android/bin/sfmobile-debug-unaligned.apk
	phonegap/platforms/android/bin/sfmobile.ap_
Merge remote-tracking branch 'origin/master'