initial import
Merge branch 'master' of github.com:highlando/manufacsols-4-heateqn