Little cleanup for subclass system
Adding Beauty Shop
Merge pull request #16 from St3eT/ertheia

improvements support for block talk with npcs