Changes made to allow successfull build in Visual Studio 2013
Merge branch 'cribe-VS2013-compat' of https://github.com/cribe78/synergy