Merge branch 'development' into training
cleaning up some more
config change
Merge branch 'training' into development