Merge Timeboxed into develop

In case no one saw, the gui text has been modified to say "Quick ~ 1 min" as suggested in the previous pull request.