Merge branch 'master' of https://github.com/xplatform/xplatform.git

Conflicts:
	build.xml
Merge branch 'master' of https://github.com/xplatform/xplatform.git