DAO
Merge origin/master

Conflicts:
	test/test/test.java