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