User merge begins
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop

Conflicts:
	BeerShop/Controllers/UsersController.cs
	BeerShop/Migrations/Configuration.cs
	BeerShop/Models/Basket.cs
	BeerShop/Models/BeerShopContext.cs
	BeerShop/packages.config
UserInterface
UserInterface
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop