Tracking and Tracing is enabled by default
Update from master
Tracking and Tracing is enabled by default
Merge remote-tracking branch 'upstream/master'
Fix layout
Merge pull request #47 from NadiaGamula/master

Tracking and Tracing is enabled by default #45