[CB-4545] support for merges directory on both wp7 & wp8
Merge branch 'origin/master'