fix stuff
Merge branch 'master' of https://github.com/Gbear605/uPic_client
fix stuff