Merge branch 'hung' of github.com:github15693/rcs into khanh
Pull hung
template after log in
template after log in