Uploading changes before PULL.
Merge branch 'devel-practice' of https://github.com/jfharney/ScientificWorkspace into devel-practice

Conflicts:
	ui-practice/frontend.js
Instructed to commit by git.
Merge branch 'devel-practice' of https://github.com/jfharney/ScientificWorkspace into devel-practice
Added new supporting files.
Another commit after adding support files.
Added new DOI view and changed some of the page template.  Also included functionality for DOI
Merge branch 'devel-practice-aprilmerge' into devel-practice-copy-april

Conflicts:
	ui/views/index1.jade