jdbc.properties password
Merge branch 'master' of https://github.com/if-050java/ATM_Locator

Conflicts:
	src/main/webapp/WEB-INF/jdbc.properties