Merge branch 'feature/MemberLogin' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 30 Nov 2015 21:15:20 +0000 (16:15 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 30 Nov 2015 21:15:20 +0000 (16:15 -0500)

Trivial merge