Merge branch 'master' of https://github.com/crabo/Reservation

Conflicts:
	SPWeb/Areas/Reserve/Controllers/mController.cs
	SPWeb/Areas/Reserve/Views/m/OfficeScheduler.cshtml
Merge branch 'master' of https://github.com/crabo/Reservation