minor changes

asdfdfminor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/candidateacademicstab.cfm
	view/workspace.cfm