Update properties and gitignore
Merge branch 'master' of github.com:egorps/ilcdb

Conflicts:
	application.properties