Release 2.1. Bug fixes and improvements

git-svn-id: https://plugins.svn.wordpress.org/advanced-access-manager/trunk@844274 b8457f37-d9ea-0310-8a92-e5e31aec5664