Merge branch 'develop' into feature/calendarNavigation
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 May 2017 13:52:31 +0000 (09:52 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 12 May 2017 13:52:31 +0000 (09:52 -0400)

Trivial merge