Equipment Mapper Refactor
Merge branch 'master' of github.com:QFrameTK/TME