for new brench
Merge branch '307' of github.com:guoxiangke/jxkh into 307
display edit options to admin
Merge branch '307' of github.com:guoxiangke/jxkh into 307