111
Merge branch 'master' of https://github.com/ybase/Sample.git

Conflicts:
	Sample/src/com/ybase/sample/db.properties