Psychiatrist/Psychologist update.

Conflicts:
	code/game/jobs/job/medical.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
Merge pull request #2 from ZomgPonies/master

Psychiatrist/Psychologist update.