Merge remote-tracking branch 'remotes/wyouflf/master'

Conflicts:
	library/src/com/lidroid/xutils/DbUtils.java
	library/src/com/lidroid/xutils/util/LogUtils.java

and fix log error