Merge branch 'master' into svn

git-svn-id: http://plugins.svn.wordpress.org/multi-media-tags/trunk@662341 b8457f37-d9ea-0310-8a92-e5e31aec5664
-confusion, +future
fixed version number and changelog
Merge branch 'master' of github.com:burgerdev/multi-media-tags