잔여기능 적용
Merge branch 'master' of https://github.com/hbyullee/gcmchatsample

Conflicts:
	src/com/example/gcmchat/UserListActivity.java