camargo3, added comments to timer + graph activity
Merge branch 'master' into camargo3
Merge branch 'camargo3'