Merge pull request #1 from sean-morris/dev

Adding nodes via d3 and overlays
Correcting indentation
Merge branch 'master' of github.com:mnjuhn/via-ui

Conflicts:
	src/main/webapp/app/css/style.css
Merge branch 'dev' of github.com:sean-morris/via-ui into dev