Update to load js and css from master branch