Removing phantom dependencie
Merge branch 'master' into testling

* master:
  Removing phantom dependencie
Adding html template to spec.js
New spec
Merge branch 'master' into testling

* master:
  Adding html template to spec.js

Conflicts:
	test/spec.js
Oo