x
Merge branch 'master' of https://github.com/mix1/tarkvaratehnika

Conflicts:
	.classpath
Add items to warehouse, confirm frame
Merge branch 'master' of https://github.com/mix1/tarkvaratehnika