asdas
Merge remote-tracking branch 'origin/master'

Conflicts:
	SAIYAN_FUN_CAMERA/android/platforms/android/CordovaLib/ant-build/build.prop
	SAIYAN_FUN_CAMERA/android/platforms/android/CordovaLib/ant-build/classes.jar
	SAIYAN_FUN_CAMERA/android/platforms/android/ant-build/build.prop
	SAIYAN_FUN_CAMERA/android/platforms/android/ant-build/dexedLibs/classes-33411ff8a787123d5a1730f77fce3da2.jar
	SAIYAN_FUN_CAMERA/android/platforms/android/assets/www/index.html