visual fix
Merge branch 'develop' of github.com:42Zavattas/Restock.io into develop

Conflicts:
	client/app/editor/editor.html
Merge branch 'develop' of github.com:42Zavattas/Restock.io into develop