Merge remote-tracking branch 'upstream/master'
fix page properties
Merge remote-tracking branch 'upstream/master' into uno
fixes
color picker
lock/unlock refresh issue
page permissions view changes
lock/unlock icon to show restricted pages
Merge remote-tracking branch 'upstream/master' into fixesPermissions
lock/unlock icon to show restricted pages
Merge pull request #239 from innaDa/fixesPermissionsLockIcon

Fixes permissions lock icon
LoginLink in header should hide autoship option if country doesn't do autoship
Merge remote-tracking branch 'upstream/master' into fixesPermissions
fixes for Permissions
fixes for Permissions
fixes for Permissions
fixes for Permissions
Merge pull request #240 from innaDa/fixesForPermissions

Fixes for permissions
Merge pull request #241 from innaDa/UnlockLockIconAdmin

Unlock lock icon admin
unlockLockBug
Merge remote-tracking branch 'upstream/master' into fixesPermissions