tests/factory
Merge branch 'master' of https://github.com/dpollot/BeerCellar

Conflicts:
	BeerCellar.Client/Modules/beerCellarModule.js