- fixed index.jsp not logged in redirect bug and
- added logout function at index.jp
fixed merge conflict in index.jsp
Merge branch 'menghong777-master'
fixed html to jsp conversion