Fixing minor conflict with menus and MP6 (backend only), as well as typos in text (no impact on functionality).

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