admin jsp complete
Merge branch 'haijie'
admin modify
index
Merge branch 'master' of github.com:honghaijei/SEProject2
first check version