Merge remote-tracking branch 'origin/dev-1.0'

Conflicts:
	ex-sdk-lib-android/bin/ex-sdk-lib-android.jar
dev-1.0 to master
1111