update views
Merge branch 'master' of https://github.com/GuavaCheckIn/GuavaCheckInWeb

Conflicts:
	GuavaCheckIn.Web.sln
Merge branch 'master' of https://github.com/GuavaCheckIn/GuavaCheckInWeb
add files
Merge branch 'master' of https://github.com/GuavaCheckIn/GuavaCheckInWeb

Conflicts:
	GuavaCheckIn.Web/GuavaCheckIn.Web.csproj
Merge branch 'master' of https://github.com/GuavaCheckIn/GuavaCheckInWeb

Conflicts:
	GuavaCheckIn.Web/GuavaCheckIn.Web.csproj