stashing
Merge branch 'master' of github.com:fabricehuet/MediaStore
Merge branch 'master' of github.com:fabricehuet/MediaStore