uk
Merge branch 'master' of https://github.com/chuandongjiewen/photoApp

Conflicts:
	res/layout/activity_main.xml
	src/com/example/photoapp/MainActivity.java
	src/com/example/photoapp/adapter/AvatarAdapter.java
	src/com/tencent/component/widget/RoundedImageView.java