Merge branch 'master' of https://github.com/dblock-team/cpl-t20-draft

Conflicts:
config/config.php
Tring to down load new config
del new config.php