Merge pull request #241 from innaDa/UnlockLockIconAdmin

Unlock lock icon admin
Merge remote-tracking branch 'upstream/master' into fixesPermissions
Merge pull request #242 from innaDa/slashImage

Slash image
unlockLockBug
unlockLockBug
pagePermissionsFix
Merge remote-tracking branch 'upstream/master' into fixesPermissions