Conflicts:
	applications/vanilla/controllers/class.postcontroller.php