ggfgf
Merge origin/master

Conflicts:
	nbproject/build.xml
	nbproject/configs/android.properties
	nbproject/configs/android_1.properties
	nbproject/configs/ios.properties
	nbproject/configs/ios_1.properties
	nbproject/plugins.properties
	nbproject/project.properties
	nbproject/project.xml