Merge branch 'dev' into thy
change message color
Merge branch 'thy' into dev