Updates.
Merge branch 'master' of https://github.com/8masterofpuppets8/EZtransBase-Android

Conflicts:
	bin/eztransbase-android.jar