update
Merge branch 'master' of https://github.com/xwjchina/fingoo.git

Conflicts:
	fingoo/src/main/resources/dbcp.properties