changes to the resume

Signed-off-by: Mohamad Ahmadi <mohamadhasan.ahmadi@gmail.com>
Merge branch 'dev_resume'
Merge branch 'master' into gh-pages