Merge pull request #714 from Arantor/release-2.1

! Some admin panel reorg: moving 'search engine tracking' out of being i...