Don’t allow a comment ID to be directly posted to edit comment.
Conflicts:
	applications/vanilla/controllers/class.postcontroller.php
Restore SafeStyles when cleditor is not in use, fixes ##2199

Conflicts:
	plugins/cleditor/default.php
cleditor: Use AppStartup for SafeStyles config
2.1.4
Merge branch '2.1' of github.com:vanilla/vanilla into 2.1