add model information to model view
nvd3, d3 version bump; fix errors in html
merge
Merge branch 'master' of github.com:connorstroomberg/gemtc-web into develop

Conflicts:
	app/views/modelView.html
change table caption depending on analysis type