import from old repo. unknown condition
Merge branch 'import' into develop
Upgraded to MSVC2012 (MSVC2013 isn't supported by Boost 1.54)