Task 2: 1,3,5 valmis
Merge branch 'master' of https://github.com/silver17/Silveri-meeskond

Conflicts:
	POS/version.properties