Update Router.js
Update LayoutView.js
Merge branch 'develop'