1.2
1.3
Merge branch 'master' of https://github.com/PandaChen/BigBank.git

Conflicts:
	BigBank/src/com/org/lxh/add_income_Activity.java