local config
Merge branch 'master' of https://github.com/weldonpro/tracker

Conflicts:
	web/index.php
Merge branch 'master' of https://github.com/weldonpro/tracker
Merge branch 'master' of https://github.com/weldonpro/tracker
fix