Merge branch 'dev' into thy
add logo
Merge branch 'thy' into dev