login commit1
Merge branch 'master' of https://github.com/hlin78/FinancialReport

Conflicts:
	bin/FinancialReport.apk
	bin/resources.ap_