Add detection for Visual Studio 14.0
Merge branch 'VS14' of git://github.com/heaths/wix3 into develop

Conflicts:
	History.md