Merge branch 'xd123' of https://github.com/wkoh/spring-xd into wkoh-xd123

Conflicts:
	scripts/xd/xd-admin
	scripts/xd/xd-admin.bat
	scripts/xd/xd-container
	scripts/xd/xd-container.bat
XD-123 Mergfe pull request #22 from wkoh/xd123