SOC-4028 | [Notification Template] Implement children plugin - Apply on Integration.
SOC-3971 | Step 5: NOTIFICATIONS_04c For another file activity + Apply UI.
SOC-4086 | [Feature Content] Implement play icon on video thumbnails.
Merge M1/M2 to make M2 branch. Fix bug.
SOC-3971 | Step 5: NOTIFICATIONS_04c For another file activity. Fix CSS bound around thumbnail bug.
Update dependencies version
SOC-4212 | Mention Email Notif is not sent when an image is linked to activity
SOC-4210 | [Watch the video] link is bad displayed.
SOC-4210 | [Watch the video] link is bad displayed. Add min-height in case of error in displaying image.
Merge master to feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/stabilization
Merge branch 'master' into feature/social-notifications
sq injection on 20140522-092858
zh-TW injection on 20140524-004830
INTEG-316 Exception on broadcasting events occurs when manage publication
INTEG-316 Exception on broadcasting events occurs when manage publication
zh-TW injection on 20140527-004846
PLF-5937 Update pom version of version kernel | core | jcr | ws to be compliant with snapshot 4.1
INTEG-214 [integ-calendar][Migration] Broken Activity Stream due to deleted events

Fix description: Don't show deleted event on activity stream.