merged ray
temp
added topTemplate
Merge branch 'ray'
Merge branch 'ray'
Merge branch 'ray'
Merge branch 'ray'
1. update chat 2. update alarm
merge remote origin
social