使用bootstrap3重构界面
Merge branch 'master' of https://github.com/elvis9xu/xjd-note

Conflicts:
	src/main/webapp/assets/css/main.css
	src/main/webapp/assets/js/main.js