Merge branch 'master' into gh-pages
updated rwbclimate
reworked directory structure
Merge branch 'gh-pages'