Merge http://github.com/pi-engine/pi into user
Merge remote-tracking branch 'upstream/user' into user
Achieved image upload
Merge pull request #231 from linzongshu/user

Achieved image upload