Feature/server2 timeout bug#19

ifuterman wants to merge 4 commits intofeature/server2ifuterman/CIManagerProject:feature/server2from

feature/server2_timeout_bugifuterman/CIManagerProject:feature/server2_timeout_bugCopy head branch name to clipboard