Updating plug-ins and restructuring CSS
Merge branch 'refs/heads/mockup' into develop
Merge branch 'develop' of github.com:Norex/struxr into develop