Merge branch 'master' of https://github.com/loryhuz/feed
Merge branch 'master' into feature/ui