Remove demofield module that is really not needed any more with the UI working. Also do some more work toward getting node_reference and user_reference working. Not done yet, but fewer errors :)

#368155 Nodereference/Userreference: Fix performance issue on large sites when validating empty noderef/userref fields.

Synch HEAD with latest Bazaar code so this version will work with core Fields in Core patch. CCk code mostly working but still needs work.