Merge branch 'feature/paymentPage' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:36:14 +0000 (14:36 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 19:36:14 +0000 (14:36 -0500)

Trivial merge