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

Conflicts:
	artifacts/extAndroid-1.0-all.jar
	artifacts/extAndroid-1.0.jar
Merge branch 'master' of https://github.com/java-extensions/ext