Updated views
Merge branch 'Ogre/7' into Ogre/7-cosmo

* Ogre/7:
  Updated views