Use new paths format.
Updated benderjs-jasmine to 0.2.3
Merge branch 'master' into coverage

Conflicts:
	package.json