modified details
Merge branch 'master' of https://github.com/stonemonkey/Internship2013
comit
113
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc/Views/Employees/Details.cshtml
jj
just trying to make pull
abb
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc.Tests/Employees/EmployeesTest.cs
	VacationManager/Ui.Mvc/Controllers/EmployeesController.cs
	VacationManager/Ui.Mvc/Controllers/EmployeesController.cs.orig
	VacationManager/Ui.Mvc/Controllers/RequestsController.cs
	VacationManager/Ui.Mvc/Scripts/modal.js
	VacationManager/Ui.Mvc/Views/Requests/Details.cshtml
	VacationManager/Ui.Mvc/Views/Requests/Index.cshtml
	VacationManager/Ui.Mvc/Views/Requests/Index.cshtml.orig
bb
Merge branch 'master' of https://github.com/stonemonkey/Internship2013
test
Merge branch 'master' of https://github.com/stonemonkey/Internship2013

Conflicts:
	VacationManager/Ui.Mvc.Tests/Employees/EmployeesTest.cs.orig