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

Conflicts:
	.gitignore
	.idea/misc.xml
	.idea/workspace.xml
	artifacts/extAndroid-1.0-all.jar
	artifacts/extAndroid-1.0.jar
	artifacts/extFfmpeg-1.0-all.jar
	artifacts/extFfmpeg-1.0.jar
	artifacts/extJava-1.0-all.jar
	artifacts/extJava-1.0.jar
	code/android/android.iml
	code/android/test/androidTest.iml
	code/ffmpeg/ffmpeg.iml
	code/ffmpeg/test/ffmpegTest.iml