Finish collection controller
Merge branch 'master' of https://github.com/davelush/sandbox