20140529-1500
Merge branch 'master' of https://github.com/hajimezhao/my-media-storage