Added last changes
Merge
merge2
merge3
Merge branch 'dev' of https://github.com/filipbartek/vrgame into dev

Conflicts:
	world/blend/stair.wrl