From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 18 May 2017 17:15:03 +0000 (-0400)
Subject: Merge tag 'v1.2.10' into develop
X-Git-Tag: v1.2.13^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=82856327066f6b8a119b2f000dcf5235b5573051;p=web%2FTroutCreek.git

Merge tag 'v1.2.10' into develop

changing live cam link, adding new summer web cam logo, changing winter activies to summer fun
---

82856327066f6b8a119b2f000dcf5235b5573051