CPRuleEditor: Since commit 2b52f7d, CPRuleEditor's delegate method -ruleEditor:displayValueForCriterion:inRow: is more restricive: you must return the same view object for a specific criterion in a given row.
In CPRuleEditorCibTest, the delegate has been updated to follow this rule, it also fixes a bug where the predicate was not correctly handling custom control values.
CPPredicateEditor: - Templates merging. Means that from the same left item you can have different views on the right:
                      * date is (today, yesterday)
                      * date is less than [text field]

                    - CPPredicateEditorCibTest example: templates merging in the 'mixed' criterion.
                    - ojtest AppKit/CPPredicateEditorTest testing the merging feature.

                    - Cleaned and rearranged code related to the right control action method.
                    - re-enable tooltips.
CPRuleEditor: -bind:toObject:withKeyPath:options: removed a useless check that was causing an exception when keyPath was a compound key path.
              CPPredicateEditor test app: bind textfield and editor to a CPObjectController.
CPRuleEditor IE7/8/9 compatibility, closes #1279
CPPredicateEditor: bindings compatibility. Send control action only after a UI interaction to prevent sending unwanted notifications to the binder.
                   Send action through the responder chain even if target or action is nil. CPControl relies on this to send updates to the binder.
CPRuleEditor: renamed private class RowObject -> _CPRuleEditorRowObject
CPRuleEditor: In -initWithFrame: the _CPRuleEditorLocalizer was not initialized by default.
CPRuleEditor : Fixes a bug where a rule editor embedded in a scroll view was not updating its frameSize when rows where added/removed.
Reported here: https://groups.google.com/d/msg/objectivej/G2MFGGSHaOY/ojcQaoNSpcAJ
I also adjusted the plus button right padding to give enough space for the scroller.
Edited CPRuleEditorCibTest xib to unhide the vertical scroller.
Cleanup: removed log statements, some comments, css transition hack for fading the drop line separator.
Merge branch 'master' of git://github.com/cappuccino/cappuccino into CPRulePredicateEditor
CPPredicateEditor tests: updated xib to Xcode 4.2 and nib2cibed.
SmartFoldersDemo: disable the size-to-fit like feature in the controller because 1/ CPPredicateEditor should have its own sizeToFit and 2/ It was shadowing other resizing bugs.
CPRuleEditor : Moved _CPRuleEditor*Button customization from class to controller  and added initWithCoder methods.
Merge branch 'master' of git://github.com/cappuccino/cappuccino into CPRulePredicateEditor
CPPredicateEditorRowNode formatting
Typo in method name + make some methods private
Merge remote-tracking branch 'upstream/master' into CPRulePredicateEditor

Conflicts:
	AppKit/CPRuleEditor/CPRuleEditor.j
Merge branch 'CPPredicateEditorRowNode-formatting' into CPRulePredicateEditor
CPPredicateEditorValueBinder cleaning, conforms to recent CPBinder updates
Fixed: collection views cleared their selection whenever the content was changed.

This was unlike Cocoa and prevented CPArrayController's selectsInsertedObjects from working.
Merge branch 'master' of github.com:cappuccino/cappuccino