model changes, test models
merge confilcts thanks
Merge branch 'master' of https://github.com/GroundSix/Profiler