Create relationships between User, Subscription, Feed
Merge branch 'master' into skwak
getting ready to merge
Merge branch 'master' of https://github.com/piinthecloud/SeeMore-Aquamarine