Merge branch 'master' of mx:/var/cache/git/repos/ctracker

diff --cc libs/lib_connect.php
Simple merge

diff --cc libs/lib_detector.php
Simple merge

diff --cc libs/lib_general.php
Simple merge

diff --cc libs/lib_updates.php
Simple merge