From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 1 Aug 2014 15:07:56 +0000 (-0400)
Subject: Merge tag 'v1.0' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ccd7489608a59e8dd5959b1977cf09c2d82214df;p=web%2FAlicesKandyKorn.git

Merge tag 'v1.0' into develop

Version 1.0
---

ccd7489608a59e8dd5959b1977cf09c2d82214df