Merge branch 'develop' into feature/icalFeedImport feature/icalFeedImport
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Apr 2017 20:53:40 +0000 (16:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Apr 2017 20:53:40 +0000 (16:53 -0400)

Trivial merge