ei midagi erilist
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties
proov
Merge branch 'master' of https://github.com/ReinhardVuks/navus

Conflicts:
	.classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath