Stuff
Merge branch 'master' of https://github.com/thinktecture/basta-endtoend

Conflicts:
	BASTALive/Controllers/CustomersController.cs