Merge remote-tracking branch 'origin/master'

Conflicts:
	ZhaoDaoNi/src/com/adn/db/DBManager.java