Merge pull request #146 from robmen/bug4513-modregex

 WIXBUG:4513 - Fix condition keyword detection in modularization regex.
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop
Merge branch 'UnbreakTestsOnDev10' into start310
Update WiX version numbers to v3.10
Votive support for VS2015

- Add/register Votive for VS2015 (plus VS2013, VS2012, and VS2010).
- Fix MSBuild targets for v3.10 installation directory.
- Also fix setup to add missing schema files.
Merge pull request #167 from barnson/start310