- running in memory
Merge branch 'Apr16-ForDemo'

Conflicts:
	src/main/webapp/WEB-INF/H2DS-ds.xml