fixed conflicts
Merge branch 'dev' of https://github.com/filipbartek/vrgame into dev