Extended Basket model, OrderItem and BeerShopContext.
Added functionality to basket controller: creating basket, adding and removing items. Also incrementing and decrementing of amount in basket is added, but int this commit it is not yet working (database validation exception).
Incrementing/decrementing in basket is now working.

The problem was in validation which failed if OrderItem.item wasn't loaded from DB.
Removed comments.
Basket detail is now partial view widget.
Added main Administration controller.
Added link for the administration to the layout.
add Order controller
changed gitignore
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop into imp

Conflicts:
	BeerShop.suo
	BeerShop/BeerShop.csproj
	BeerShop/bin/BeerShop.dll
	BeerShop/bin/BeerShop.pdb
	BeerShop/obj/Debug/BeerShop.csproj.FileListAbsolute.txt
	BeerShop/obj/Debug/BeerShop.dll
	BeerShop/obj/Debug/BeerShop.pdb
	BeerShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop into OrderBranch

Conflicts:
	BeerShop.suo
	BeerShop/BeerShop.csproj
	BeerShop/Models/Basket.cs
	BeerShop/bin/BeerShop.dll
	BeerShop/bin/BeerShop.pdb
	BeerShop/obj/Debug/BeerShop.dll
	BeerShop/obj/Debug/BeerShop.pdb
	BeerShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Tested merge
After PagedList installation
Merge branch 'master' of github.com:SoftwareProject2013/BeerShop

Conflicts:
	BeerShop.suo
	BeerShop/BeerShop.csproj
	BeerShop/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	BeerShop/packages.config
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
commit before merging
UserInterface
UserInterface
Merge branch 'master' of https://github.com/SoftwareProject2013/BeerShop