changing shoot timeout to 5 seconds
Merge branch 'develop' into no_auto_mode