Use relative paths for css / js resources
Merge branch 'master' into gh-pages