nganu.. eh
Merge branch 'develop'
show timestamp in chatboard
Merge branch 'develop'