merging in changes to js/css from other repo