Merge pull request #715 from Arantor/release-2.1

! Use the right area for admin panel search for security settings, and f...