intermediate state - otherwise I cannot download your changes
Merge branch 'master' of https://github.com/Lessip/WebEngineering2013_2014

Conflicts:
	CarSharing/CarSharing.csproj