somehow, files that shouldn't have been committed have been, so checking in the rest
Merge branch 'master' of https://github.com/QFrameTK/TME