Merge pull request #14 from HR-Data-Geyser/develop

Merge develop into master
fixes merge conflict
adds basic leap controls, orbitcontrols not working
Merge branch 'feature/Addleap' into develop
Merge pull request #43 from HR-Data-Geyser/feature/new-globe

Feature/new globe
globe-test
Merge branch 'develop' of github.com:HR-Data-Geyser/Data-Geyser into feature/globe-test

Conflicts:
	globe-test/globe.js
	globe-test/globetest.html
	globe-test/globetest.js
Merge pull request #44 from TGVarik/feature/globe-test

Merge branch 'develop' of github.com:HR-Data-Geyser/Data-Geyser into feature/globe-test
fixes merge conflicts
finished merge conflicts
fixed bad merge
cleanup of develop
adds ng-repeat table
Merge pull request #47 from biversen21/develop

adds ng-repeat box and starts refactor of angular
starts adding photo feature...photos fly but need to fix x-origin problem
Merge branch 'master' of https://github.com/HR-Data-Geyser/Data-Geyser into develop
integrate new spark visualization
adds cors module (non-functional) and adds controls init func
Merge pull request #48 from TGVarik/feature/spark

integrate new spark visualization
Merge branch 'develop' of https://github.com/HR-Data-Geyser/Data-Geyser into feature/Addflyingphotos