Merge branch 'master' of github.com:Askelon/wpmovielibrary into svn