add Order controller
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