Merge branch 'master' into stairs

merging wiht ours
Merge branch 'master' into ac

stuff with ours