Set default time limit in schedule_simulation_managers controller method
Merge remote-tracking branch 'origin/master'