Merge branch 'release-0.1.10' into develop
Revert "Finished replacing jasmine with mocha"

This reverts commit 0ebc062c76479bfa22894d05b8d48f9fe015ec59.

Conflicts:
	e2e-test/e2eTest.js
	package.json
Figured out the end2end tests.
Bumped version
Merge branch 'release-0.1.11'