Merge branch 'master' into ross
Removed unnecessary classes
Started editing Entity
Began Items
Merge origin/ross into ross