setup for disable editing on select2
setup problemService for story #12
problemService getProblem (alternatives part)
refactor test
Get drugIds by namespaceUri from tripleStore
retrieve drugIds from trialverse
resolve conflicts
Merge branch 'develop' of github.com:DanielReid/addis-core into develop

Conflicts:
	src/main/webapp/resources/app/js/controllers/analysisController.js
	src/main/webapp/resources/app/views/analysis.html