Upgrade Framework to match M3.sln.
Upgrading Tracker reference
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Framework
	Tracking