updated db connect string
Merge branch 'master' of https://github.com/kosakm/employee-tracker

Conflicts:
	conf/application.conf
Merge branch 'master' of https://github.com/kosakm/employee-tracker