loininpage
Merge branch 'master' of https://github.com/hlin78/FinancialReport.git

Conflicts:
	bin/classes/com/example/financialreport/R$layout.class
	bin/classes/com/example/financialreport/R$menu.class
	bin/classes/com/example/financialreport/R$string.class
	bin/classes/com/example/financialreport/R$style.class
	gen/com/example/financialreport/R.java
	res/values/strings.xml