change by notepad++
Merge branch 'master' of https://github.com/xdcradle/cradle

Conflicts:
	Cradle/src/DbDao.java