initial commit
Merge branch 'master' of https://github.com/tspaeth/springxdemo

Conflicts:
	LICENSE
	README.md