Merge branch 'feature/frontCalendar' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 25 Aug 2016 18:40:00 +0000 (14:40 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 25 Aug 2016 18:40:00 +0000 (14:40 -0400)

Trivial merge