Don't track other companies directories
Remove unnecessary references to $db as it is already a global variable
Merge pull request #384 from fahadhatib/develop

Develop