Cancel action updated
needed for update
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc/Controllers/RequestsController.cs.orig
Add The Rainbow Game of Life = TheGame
Add the game
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc.Tests/Requests/RequestsTests.cs
	VacationManager/Ui.Mvc/Controllers/RequestsController.cs
	VacationManager/Ui.Mvc/Controllers/RequestsController.cs.orig
	VacationManager/Ui.Mvc/Ui.Mvc.csproj
	VacationManager/Ui.Mvc/Views/Requests/Details.cshtml
	VacationManager/Ui.Mvc/Views/Requests/Index.cshtml
	VacationManager/VacationManager.sln