fix tests and match end
Merge branch 'master' into fix-tests

Conflicts:
	app/scripts/httpBackendStub.js
Merge branch 'master' into fix-tests

Conflicts:
	app/scripts/httpBackendStub.js
fix hardcoded api url
fix last url hardcoded
Merge pull request #16 from M6Web/fix-tests

Fix tests and match end