pom pom
Merge branch 'master' of https://github.com/KaptenTiigu/Remonditeenused

Conflicts:
	remonditeenus/target/m2e-wtp/web-resources/META-INF/maven/ee.remonditeenus/remonditeenus/pom.properties
mingi merge jaoks vaja