A prettier example layout and dev view
Merge branch 'master' into gh-pages