各个页面，需用bootstrap改善
Merge branch 'master' of https://github.com/keso-elft/weixin

Conflicts:
	src/java/com/barrage/task/MenuCreateTask.java