创建分支
16:47PM 03/05/2014 添加message
增加贷款、还款页面
Merge branch 'master' into fxf

Conflicts:
	AndroidManifest.xml
	res/layout/activity_loan_applay.xml
	res/layout/activity_transfer_interbank.xml
	res/layout/fragment_loan.xml
	res/layout/fragment_loan_apply_branch_selection.xml
	res/layout/fragment_loan_apply_complete.xml
	res/layout/fragment_loan_apply_general_information.xml
	res/layout/fragment_loan_apply_loan_demand.xml
	res/layout/fragment_loan_apply_summary_information.xml
	res/layout/fragment_settings.xml
	res/layout/fragment_transfer.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/mintaibank/cellphone/tools/LoanApplyInterface.java
	src/com/mintaibank/cellphone/view/CaActivity.java
	src/com/mintaibank/cellphone/view/LoanApplyActivity.java
	src/com/mintaibank/cellphone/view/SettingsFragment.java
	浙江民泰商业银行手机银行客户端软件设计.doc
Merge branch 'master' of https://github.com/NeutronStarCO/MinTaiBank.git
ament