//添加手势密码
Merge branch 'master' of https://github.com/yylc/loans.git

Conflicts:
	gen/android/support/v7/appcompat/R.java
	gen/com/handmark/pulltorefresh/library/R.java
	gen/com/will/loans/R.java