Testing
Merge branch 'master' of github.com:PeterButzelaar/Butzelaar.Webshop

Conflicts:
	Butzelaar.Webshop.TestApplication/Program.cs