Merge branch 'feature/arms' of github.com:connorstroomberg/trialverse into feature/arms
study controller spec WIP
datasetService WIP
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