ui update
Pajeon UI job finished
Merge branch 'master' of https://github.com/hongkunyoo/athere-android

Conflicts:
	res/layout/row_chat_notification_list.xml
	res/values/dimens.xml