moved files to /resources
Merge branch 'master' into gh-pages