fixes
Merge branch 'master' of https://github.com/Gargamel1989/Seasoning.git
enhanced availability data in view ingredient
some enhancements
Merge branch 'master' of https://github.com/Gargamel1989/Seasoning.git

Conflicts:
	Seasoning/authentication/templates/authentication/account_settings.html
	Seasoning/general/static/css/layout.css
stuff