stuff
Merge remote-tracking branch 'origin/Doris'

Conflicts:
	NewResume.php
Fixed conflicts