track and team views controllers and decorators
Merge branch 'master' of github.com:adr-enal-in/planogram