pass $q to settingsMock for synchronized testing, updated tests

Conflicts:

	spec/services/ng-challengeSpec.js
	src/js/services/ng-challenge.js
tests for ng-settings
updated xhrSpec
Added tests for fs-pg

add fs-pg spec
Call done() on promise chain when a promise is returned from jasmine spec runner