tagasi alguses
Merge branch 'master' of https://github.com/mlehtmets/i377

Conflicts:
	build.xml
	mlehtmets.war