Merge branch 'release' into development
adding user permissions
Merge remote-tracking branch 'origin' into release