merge
resolve conflicts
fix detail controller instantiation
Merge branch 'master' of https://github.com/loryhuz/feed into feature/ui