branch test commit
more proper place for including pa function
fix pa()
shortcuts
include shortcuts
Merge branch 'origin/frontend-rbac'
Merge branch 'origin/backend-rbac'
Merge branch BACK with 'origin/master'