vanalles
Merge branch 'master' of https://github.com/Gargamel1989/Seasoning

Conflicts:
	Seasoning/general/static/css/layout.css