rebase with Master
Merge branch 'Accept-Item-type-component-views' of github.com:crossroads/app.goodcity into Accept-Item-type-component-views
fixed accept screen component rendering after multiple switching