Resolve folder name conflicts in View
update UpgradeShell
Merge pull request #1642 from dereuromark/3.0-view

3.0 view