merged master author:@pilord12
doubly merged master and couple of minor changes to activity messages for consistency