Added image and video activities
Merge branch 'master' of https://github.com/betandr/lockedin