Merge branch 'issue-006' into develop
fixed the footer issue with pixi_terms.html
Merge branch 'develop' of https://github.com/sdbmich1/plumboard into fixed-pixi-terms-050414
Merge branch 'develop' of github.com:sdbmich1/plumboard