Ignore updated
Merge remote-tracking branch 'upstream/development' into development
User Activity Stream metabox fix
Merge pull request #4 from antonkorotkov/development

Activity History fix