fixed merge conflicts
fixes master pull conflicts
minor code tweaks before pull
Merge branch 'development' of github.com:laurentqro/cantine into development
small changes to make branch match origin
can add subscription to feed, working code
fixed merge conflicts