#9 fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/naukma/cauliflower/dao/DAO.java
Merge branch 'master' of https://github.com/worm1k/OSS_Cauliflower