M
Merge remote-tracking branch 'origin/master'

Conflicts:

	miVacationSurfer/miVacationSurfer/Controllers/ActivityReviewController.cs
	miVacationSurfer/miVacationSurfer/Views/ActivityReview/Index.cshtml
Merge branch 'master' of https://github.com/abeshiv/TeamTenProductions

Conflicts:

	miVacationSurfer/miVacationSurfer/Controllers/ActivityReviewController.cs
	miVacationSurfer/miVacationSurfer/Views/ActivityReview/Index.cshtml
k
Merge remote-tracking branch 'origin/master'

Conflicts:

	miVacationSurfer/miVacationSurfer/Controllers/ActivityReviewController.cs
	miVacationSurfer/miVacationSurfer/Views/ActivityReview/Index.cshtml