tweak
Merge branch 'master' of https://github.com/ScottsTots/TraceMe
fixed some state
Fixed some out of memory issues with activities not being finished when they shouldve