behavior update
Merge branch 'master' of github.com:redelmann/e-zimod-server

Conflicts:
	Utils/DBManager.hs