add support for ignore collisions and collisions will/wont move entities
Merge branch 'master' of https://github.com/highfidelity/hifi into moreWorkOnCollidingEntitites
Merge pull request #3490 from ZappoMan/moreWorkOnCollidingEntitites

add support for ignore collisions and collisions will/wont move entities