Merge branch 'master' of C:\wamp\www\movies with conflicts.