updating cardsui-for-android repo url to https://github.com/Androguide/cardsui-for-android
updating android-ffmpeg peg
Merge branch 'master' of https://github.com/guardianproject/storymaker into secureshare