Added files for settings page.
Commit for merging.
Merge branch 'devel-practice' of https://github.com/jfharney/ScientificWorkspace into devel-practice

Conflicts:
	ui/public/workspace/js/ajax/jobinfo.js
	ui/public/workspace/js/core.js
	ui/public/workspace/js/main.js
Merge branch 'devel-practice-copy' into devel-practice