Merge branch 'thy' into dev
decorate login, rectify forum bugs
Merge branch 'dev' into thy