admin jsp complete
Merge branch 'haijie'