登录页面根据bootstrap3调整完成
Merge branch 'master' of https://github.com/elvis9xu/xjd-note

Conflicts:
	src/main/java/com/xjd/note/web/note/NoteController.java
	src/main/webapp/assets/js/nav.js