commit
Merge branch 'master' of https://github.com/yylc/loans.git

Conflicts:
	gen/com/will/loans/R.java