initial commit
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF