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/social-notifications
SOC-4200 | Email notification - display correct all kind of file types.
Update gatein dependency
Merge branch 'master' into feature/stabilization
Merge master to feature/social-notifications
pl injection on 20140526-142752
pl injection on 20140619-111507
Merge feature/social-notifications to master
Merge branch 'feature/stabilization'