working on testing unts
Merge remote-tracking branch '$451order_stable/master'

Conflicts:
	config/karma.conf.js
Merge remote-tracking branch '$451order_stable/master'

Conflicts:
	config/karma.conf.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/karma.conf.js
	test/unit/appSpec.js