bla
Merge branch 'domi' of https://github.com/oemisch/spices_frontend into domi

Conflicts:
	js/main.js
	select.html