resume controller
resume modal window
Merge branch 'new_design' of github.com:SBS-team/ror_team into new_views_styles