Finalizing admin fixes and working on marketing site (pricing table incomplete)
Merge branch 'develop' of github.com:RyanNielson/hashpipe into develop
Merge branch 'develop' of github.com:RyanNielson/hashpipe into develop