Cosmetic change to main
Merge branch 'devel-practice' of http://github.com/jfharney/ScientificWorkspace into devel-practice
Merge branch 'devel-practice' of http://github.com/jfharney/ScientificWorkspace into devel-practice

Conflicts:
	ui/public/doi/js/main.js
Merge with remote 8-26
Merge branch 'devel-practice' of http://github.com/jfharney/ScientificWorkspace into devel-practice
Merge branch 'devel-practice' of http://github.com/jfharney/ScientificWorkspace into devel-practice
Cosmetic change to the doi submission
WIP: Full DOI submission procedure including heterogeneous tag/file submission and an extra entry for all nids