D
Merge remote-tracking branch 'origin/master'

Conflicts:
	miVacationSurfer/miVacationSurfer/Web.config
f
Merge branch 'master' of https://github.com/abeshiv/TeamTenProductions

Conflicts:
	miVacationSurfer/miVacationSurfer/Views/ActivityReview/Index.cshtml
Revert "D"

This reverts commit 219d618160077d21fc046a4330324ae745f12742.

Conflicts:
	miVacationSurfer/miVacationSurfer/Web.config
Merge branch 'master' of https://github.com/abeshiv/TeamTenProductions

Conflicts:
	miVacationSurfer/miVacationSurfer/Web.config
Update
Merge branch 'master' of https://github.com/abeshiv/TeamTenProductions

Conflicts:
	miVacationSurfer/miVacationSurfer/Web.config
UP
Merge branch 'master' of https://github.com/abeshiv/TeamTenProductions

Conflicts:
	miVacationSurfer/miVacationSurfer/Web.config