needed default
Merge branch 'master' of https://github.com/LabAdvComp/Bionimbus

fixed the conflict
Conflicts:
	models/db_wizard.py