handle tr1 vs c++11 collisions in vs2012
Merge branch 'master' of https://github.com/HeliumProject/Platform