Commit a good stage.
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc/Ui.Mvc.csproj