Merge branch 'develop' of github.com:ConnorStroomberg/addis-core into develop
WIP network diagram
Merge branch 'feature/network-graph' of https://github.com/DanielReid/addis-core into feature/networkgraph
Network graph plus test skeleton
Merge branch 'feature/network-graph' of https://github.com/DanielReid/addis-core into feature/networkgraph
layout graph labels
table styling
styling tweeks
more label alignments
Increase font size for table header
Network spec
Caption plus styling for network graph
remove padding from graph
fix for sql error
Merge branch 'develop' of github.com:ConnorStroomberg/addis-core into feature/network-graph
check gemtc model connectedness
Merge branch 'feature/networkgraph' of github.com:ConnorStroomberg/addis-core into feature/network-graph

Conflicts:
	src/main/webapp/resources/app/css/addis-drugis.css
	src/main/webapp/resources/sass/addis-drugis.scss
Check for more than 1 intervention; fix: edges should not be directed
exclude arms in networkanalysis, repository part
add controller test for exclusion arms