Merge branch 'master' into dev
moved spring config files into resources
Made jndi name filterable as it has a different value in prod
Merge branch 'dev'
[maven-release-plugin] prepare release yourcarslife-webapp-1.0.2