Merge branch 'ui-refactor' into 'master'
bumped version number and updated change log