Merge branch 'develop'

git-svn-id: http://plugins.svn.wordpress.org/post-snippets/trunk@655749 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of github.com:artstorm/post-snippets