Merge pull request #212 from way2muchnoise/1.7-update

fixes #210
should fix ticking proxy entitys