compress
Merge branch '0.5.6' of https://github.com/b3log/b3log-solo into 0.5.6

Conflicts:
	war/src/main/webapp/admin-plugin-list.ftl

	modified:   war/src/main/webapp/js/admin/plugin.js
	modified:   war/src/main/webapp/js/admin/pluginList.js
compress