karma continuous
Merge branch 'develop' of github.com:42Zavattas/Restock.io into develop

Conflicts:
	client/app/rule-sketch/rule-sketch.directive.spec.js