Merge remote-tracking branch 'origin/master'

* origin/master:
  1. Base url issue fixed 2. Data source JNDI context issue fixed

Conflicts:
	pom.xml