edit

edit
Merge branch 'master' of https://github.com/niltors/coder

Conflicts:
	Project/Backstage/Controller/ResumeController.class.php