view permissions now handled in the right order
Merge branch 'development'