resetting
Merge branch 'master' of https://github.com/DonoA/Reemlift

Conflicts:
	build.xml