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

Merge branch 'master' into develop
---

d49bed687292d9edb80edc722ffde95ee4fed3af