Started adding bounding boxes to entitys
Merge remote-tracking branch 'origin/JoeBranch'