Updated DbUser
Merge branch 'master' of github.com:hillst/PhenoFront
Integrated the NIR conversion. Now produces NIR images as well.
Added functionality for FLOU images. Plugged them into the zipped util. Also cleaned up unused imports.
Merge branch 'master' of github.com:hillst/PhenoFront

Conflicts:
	src/main/java/src/ddpsc/database/user/DbUser.java