Merge branch 'feature/FixAddPackageButton' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:59:29 +0000 (11:59 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:59:29 +0000 (11:59 -0500)
Conflicts:
views/admin/members/packaging.html


Trivial merge