Merge branch 'develop' into feature/icalFeedImport
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Apr 2017 18:41:04 +0000 (14:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Apr 2017 18:41:04 +0000 (14:41 -0400)

Trivial merge