Merge pull request #81 from acmetech/master

Fix the activity_object likes method and refactor the person likes method
Merge pull request #83 from acmetech/master

Update the rspec generator options
Merge pull request #84 from acmetech/master

Move ObjectTypeBase to models/concerns/socializer
Merge pull request #85 from acmetech/master

Data consistency changes