Merge branch 'gh-pages' into develop
Merge branch 'gh-pages' into develop
Complete redesign

Most of the redesign is complete. Some tweaking is still required
Merge branch 'release/0.0.6' into gh-pages