(site) use upstream theme again, add local versions of used js
Merge pull request #3 from headissue/site-back-to-upstream

(site) use upstream theme again, add local versions of used js