Conflicts:
	kityminder/src/theme/bottom.js
	lib/commentModel.php
	modules/ajax/main.php
	template/skin/think/forum/view.html
topic operation