Revert "merge to one tracker"

This reverts commit 2e432bb7abb4f2de54a3741dbeb44e21ee6546cd.
Merge remote-tracking branch 'origin/master'

Conflicts:
	tracking.js-master/examples/headclothing.js