Merge pull request #33 from ExperienceOrb/master

Merge master with David's Branch
Merge remote-tracking branch 'origin/master' into David's-Branch
Non rendering entities
Merge pull request #34 from ExperienceOrb/David's-Branch

David's branch