bugfix
update
update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	Sample/libs/pg-1.2.jar
	Sample/src/com/baoyz/pg/sample/model/User.java