bug fix
OAuth
B
SPWeb with Scheduler
Merge branch 'master' of https://github.com/crabo/Reservation

Conflicts:
	SPWeb/Controllers/Sys/UserController.cs
	SPWeb/SPWeb.csproj
	SPWeb/Views/Account/LogOn.cshtml