some changes
Merge branch 'gh-pages' of https://github.com/eResearch/js-startup into gh-pages