修改
Merge branch 'master' of https://github.com/huangsanm/UISample

Conflicts:
	.idea/libraries/android_async_http_1_4_5.xml
	.idea/libraries/baidu_tj_3_4.xml
	.idea/libraries/gson_2_2_4.xml
	.idea/libraries/guice_2_0_no_aop.xml
	.idea/libraries/library_1_0_5.xml
	.idea/libraries/picasso_2_3_4.xml
	.idea/libraries/retrofit_1_6_1.xml
	.idea/libraries/roboguice_2_0.xml
	.idea/libraries/support_v4_19_1_0.xml
	.idea/libraries/universal_image_loader_1_9_2.xml
	.idea/libraries/urlimageviewhelper_1_0_4.xml
	.idea/libraries/volley.xml
	.idea/misc.xml
	.idea/modules.xml