Merge branch 'tabs'
Merge branch 'master' of https://github.com/greenido/NiceViews