Fixed account confirm email
Added gender and date of birth to user model
Commit during disk rescue
Merge branch 'master' of https://github.com/Gargamel1989/Seasoning into feature/ingredients
Merge branch 'feature/ingredients' into develop

Conflicts:
	Seasoning/authentication/forms.py
Edit ingredient toolchain initiated
Add ingredient form finished
added static files
Ingredient List Added
fix
db backup fix
update script fix
backup db fix
fix
fix
backup bugfix
bugfix
added enctype to image upload form for ingredients
units can now be added through a form
units can depend on other units for their meaning through a ratio
parameter