Add resume page
Merge branch 'dev'