Merge branch 'master' into crackerPatch
error pic update
add websocket bib to app
add database class to app
Merge branch 'crackerPatch'