fixed bugs and upgrade to 2.1.1

git-svn-id: https://plugins.svn.wordpress.org/starbox/trunk@905342 b8457f37-d9ea-0310-8a92-e5e31aec5664