merging ui into training
Merge branch 'master' into training