Added movable flag to shape and a first implementation of resting contact
Merge branch 'master' of https://github.com/forsythrosin/MosPro