Merge branch 'feature/arms' of github.com:danielreid/trialverse into feature/arms
setup for service test
Merge branch 'feature/arms' of github.com:danielreid/trialverse into feature/arms

Conflicts:
	src/main/webapp/resources/app/js/dataset/datasetServiceSpec.js
tests for front-end
edit arm
move query to external .spaql  file
add query i forgot
refactor/restructure