Test commit
DAO, DTO, Utils
Merge branch 'master' of https://github.com/ribbon-xx/worldcup2014-su1312m

Conflicts:
	.idea/workspace.xml