add error page and change picUpload
Merge remote-tracking branch 'origin/master'