Merge refactor/#87 into master this will close #87

Conflicts:
	app/js/services.js
	test/unit/servicesSpec.js