MockEntity needs to be fixed
Merge branch 'porting' of gh0s1.github.com:GH0S1R33P0R/USFSpr2014SSunView into porting