Added tracking logic to tracking class files
Merge branch 'master' of https://github.com/rajatparida86/ARE