Merge pull request #3 from ambitioninc/develop

0.1 release
updated related name to avoid clashing with entity_subscription
fixed merge conflict