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

Conflicts:
	war/src/main/webapp/js/admin/plugin.js
	war/src/main/webapp/js/admin/pluginList.js