Development on brewery and storagelocation
Merge remote-tracking branch 'origin/master'

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