Merge conflicts with remote resolved.
AJAXified the editing and updating of surveys