Merge branch 'hotfix/update-admin-menu'
Merge branch 'hotfix/update-features' into dev
Add blocks and contexts.
Add version number to uft_blocks.
update permissions
update staff and units features
BUGGY new version of timetable view
Revert "BUGGY new version of timetable view"

This reverts commit 0b8061366a5e914dd9ec8335c6e83d14efd15032.
Merge branch 'feature/timetable-views' into dev