Merge branch 'feature/125-pin'
Updated maps key to be admin only
Merge branch 'feature/65-perms' into test