Merge branch 'master' of C:\wamp\www\wp-a2 with conflicts.
tgm