changed my mind about including those js files in the repo.
Merge branch 'master' into dbSetup