Placed all the demos in this singe project together
Merge remote-tracking branch 'origin/master'

Conflicts:
	fail-over/src/main/resources/jndi.properties