Merge branch 'master' into development

Accidentally have been making bug fixes on master instead of development
Added file handler for resume
Merge branch 'development'