Adding code to make the styles and scripts relative links instead of absolute to work around an issue with http and https
Merge branch 'refs/heads/master' into test