Merge branch 'refs/heads/master' into gh-pages
Merge branch 'refs/heads/master' into gh-pages
explanation of spa & rest moved further
notes
Merge branch 'refs/heads/gh-pages'