添加favicon
新增一款bootstrap主题
合并
调整
Merge branch 'master' of https://github.com/M-LOG/M-LOG.git

Conflicts:
	mlog-web/src/main/java/org/mspring/mlog/web/query/CommentQueryCriterion.java
	mlog-web/src/main/webapp/WEB-INF/views/user/ui.ftl