STH
Merge github.com:suntinghui/LYY4Android_ICBC

Conflicts:
	bin/classes/com/people/icbc/activity/AccountsInfoActivity.class
	bin/classes/com/people/icbc/activity/ConfirmOrderActivity.class
	bin/classes/com/people/icbc/activity/LoginActivity.class
	bin/classes/com/people/icbc/activity/MainActivity.class
	bin/classes/com/people/icbc/activity/RegisterActivity.class
	bin/classes/com/people/icbc/view/ADProgressDialog.class
	bin/classes/com/people/icbc/view/LKAlertDialog.class
	bin/classes/com/people/icbc/view/LKProgressDialog.class
	bin/classes/com/people/icbc/view/LKScheduleDialog.class
	bin/classes/com/people/icbc/view/LocusPassWordView.class
	gen/com/people/icbc/R.java