xddd
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/build.xml
	bin/classes/env/Connection.class