fix network page bug after merge
save for merge
merge
implement some features and fix bug
modify sms content
clean comments
modify js code
modif css
merge
Merge pull request #300 from jialinsun/master

fix bug and add features