updated/merged MQ2-20131008 to mqX2
Fix VC 120 build from merger ect ect