Merge branch 'master' into raysmond
UI modification
Merge branch 'raysmond'