Actor class
Actor class
Location class
Location class
Merge origin/master