Merge branch 'master' of https://github.com/baconscript/julia-cad-viewer

Conflicts:
	lib/julia-cad-viewer-view.coffee
	package.json