Simple_form returns.
Supply flash success message.
Merge branch '961-folder_creation' into develop