adding MSVCRT merge module to Windows installer
updating to VC10 merge module to comply with build machine configuration
Merge branch 'bchin/issue-2872' of git://github.com/adobe/brackets-shell into limecraft-edge

Conflicts:
	installer/win/Brackets.wxs