update application.conf
Merge branch 'master' of github.com:sameersingh/er-visualizer

Conflicts:
	conf/application.conf