Change default test running reporting to spec style
Merge branch 'master' of github.com:unepwcmc/NRT

Conflicts:
	server/package.json