Promise testing
Merge origin/master

Conflicts:
	app/js/app.js
	test/unit/serviceSpec.js