commit
Merge https://github.com/huiyuan/photoupload