changes to use the Jelastic DB
Merge branch 'develop' of https://github.com/entirej/incubator into develop

Conflicts:
	test-projects/ejinvoice/ej-invoice/WebContent/META-INF/context.xml