修正了部分title无法显示的问题
Merge branch 'master' of https://github.com/alibaba/druid
Merge branch 'master' of https://github.com/alibaba/druid

Conflicts:
	src/main/resources/support/http/resources/js/lang.js
Merge branch 'master' of https://github.com/alibaba/druid
Merge pull request #385 from yunnysunny/master

版本库版本号更新
Merge remote-tracking branch 'upstream/master'