Merge branch 'master' of https://github.com/java-extensions/ext

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/java-extensions/ext

Conflicts:
	artifacts/extAndroid-1.0.jar
	artifacts/extFfmpeg-1.0.jar
project changes