Merge pull request #678 from Arantor/release-2.1

! Clean up the Cookies and Sessions admin panel page, including sprucing...