收藏，搜索
Merge https://github.com/Raymond007/Outsourcing

Conflicts:
	youlian_me/gen/com/example/youlian/R.java
	youlian_me/gen/com/umeng_social_sdk_res_lib/R.java