Merge remote-tracking branch 'origin/develop' into issue/1054-improving-comment-like-notification-ui

Conflicts:
	WordPress/Classes/Note.h
	WordPress/Classes/Note.m
NoteBodyItem: Style update
Merge remote-tracking branch 'origin/develop' into issue/1054-improving-comment-like-notification-ui

Conflicts:
	WordPress/Classes/Note.m
Nukes Author / Licensing info from newly added files
Merge pull request #1513 from wordpress-mobile/issue/1054-improving-comment-like-notification-ui

Issue #1054: Improving comment like Notification UI
Merge branch 'develop' into issue/1508-notifications-badge-detail-view

Conflicts:
	WordPress/Classes/Note.h
	WordPress/Classes/Note.m
	WordPress/Classes/NotificationsFollowDetailViewController.m