reciprocity/ggrc-core — pull request #2034 by bmomberger-reciprocity (2014-11-13 23:59:30+00:00)
Title: CORE-622 Resolve conflicts better when changing checkboxes in CTGOT

This is a more generalized conflict resolution mechanism, not specific to the workflow objects, for times when an object was updated by someone else while you were looking at it. If you attempt to update the object, it will try to merge the changes that you made since the last sync with the changes between the last and current sync. If the two change sets don't touch the same keys, the object will be saved with your changes, otherwise any conflicting properties will be set to the remote values and a flash message will be generated informing the user of this.
In addition, the in_array Mustache helper has been updated as it was not properly live binding to the haystack list before.