Merge branch 'master' of https://github.com/jaanikalehtsalu/siseveeb

Conflicts:
	controllers/ained.php
Merge branch 'master' of https://github.com/jaanikalehtsalu/siseveeb
Adding klass_ruum