reset model.hpp to the wotking one
solve model.hpp conflicts when merging with scheme branch
before phi scheme, stable version
resolve merge conflicts
doxygen update to templated version
add phischeme to scheme
reorganisation qt project tree
barrier added but not working/ need changes in scheme/phischeme classes