Dealt with not kicking people out of activities with handleError and sometimes intentionally kicking them out
Fixed merge conflicts and fixed one error where finishActivity was not set to true in progressUpdate