Fixing OverTime
Fixing websocket
OverTime + Crytkey + Fix
Remove backup swap system
Merge remote-tracking branch 'upstream/beta' into beta

Conflicts:
	bootstrap.php
	src/eBot/Application/Application.php
	src/eBot/Config/Config.php
	src/eBot/Manager/MatchManager.php
	src/eBot/Match/Match.php
	websocket_server.bat
	websocket_server.js