Integrated fixes by Samatva, works now with 4.0.1

git-svn-id: https://plugins.svn.wordpress.org/imagemapper/trunk@1029963 b8457f37-d9ea-0310-8a92-e5e31aec5664
Fixed to work with wordpress 4.0.1

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