Permissions/Optional menus
Merge branch 'master' of https://github.com/waffledoc/library.git