Merge branch 'develop'
Merge branch 'develop'
Merge branch 'release/tsc1.0'
Changed IP to .22. cause 33 is used by csico routers
Added missing timezone param to base.php
Merge branch 'hotfix/tsc1.1' into develop