Merge origin/master

Conflicts:
	nbproject/plugins.properties
	platforms/android/assets/www/config.xml
	platforms/android/bin/MilleFeuille-debug-unaligned.apk
	platforms/android/bin/MilleFeuille-debug.apk
	platforms/android/bin/MilleFeuille.ap_
	platforms/android/bin/MilleFeuille.ap_.d
	platforms/android/bin/build.prop
	platforms/android/bin/classes.dex
	platforms/android/bin/classes.dex.d
	platforms/android/bin/dexedLibs/cordova-3.0.0-92bd2ff3ffbb77e8f2d5d3d1b0d570a8.jar
	plugins/android.json
	www/config.xml