edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/Backstage/View/Resume/resume_project.html