fix conflicts

git-svn-id: http://plugins.svn.wordpress.org/wpmanagerpro/trunk@763466 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of github.com:fayland/wpmanagerpro