nevermind
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc/Views/Dashboard/Index.cshtml
var2
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc/Views/Shared/_Layout.cshtml
route changes
before persistence errors
Merge branch 'master' of https://github.com/stonemonkey/Internship2013
jquery included
merge bine
butoane la pm si hr in dashboard
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc/App_Start/RouteConfig.cs
	VacationManager/Ui.Mvc/Ui.Mvc.csproj.orig
	VacationManager/Ui.Mvc/Views/Requests/Index.cshtml
	VacationManager/Ui.Mvc/Views/Shared/_Layout.cshtml
	VacationManager/Ui.Mvc/Views/Shared/_Layout.cshtml.orig
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc/Views/NewRequest/Index.cshtml
ceva
resharping
pre employeerequests tests
pre employee tests
etc
update dashboard