modified Foo1
Merge remote-tracking branch 'origin/test2' into test2

Conflicts:
	test/dao/Foo1.java