Merge branch 'master' into jazzmine
moved jazzmine (and its dependencies) out of the project and loaded it via npm instead
Merge branch 'jazzmine'