Added a few types/templates to help with expression tree evaluation
Merge branch 'release/0.12'
Merge tag '0.12' into develop

Fixed CMakeLists for Windows (hopefully), plus some minor changes