Begin developpment of errors management
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/hops/hops.controller.js
End developpment of errors management
Merge branch 'master' of github.com:MishkaBeer/mishka-beer

Conflicts:
	client/app/hops/hops.controller.js