Restructuring the placement of elements on the Node Details page
Merge branch 'master' of https://github.com/informaticslab/apollo

Conflicts:
	src/server/views/partials/node.jade