Revert "remove foo5"

This reverts commit 0666a758f85f043ab4386c1f0080d85ba8857e12.
Revert "Revert "remove foo5""

This reverts commit 46bc743c706c1f183b8e2000910bf47e5816bb71.
add 2 to comment
Merge remote-tracking branch 'origin/test2' into test2

Conflicts:
	test/dao/TestDaoImpl.java