Cleanup of redundant functions: merge assign and with

This one is probably more controversial, but it would be good to use a single table "activity relationship" to put both the assigned and with contacts (discussion started with eileen around the activity api).

Rationale:

With having one table we can get rid of the join and temporary tables, and in general simplify quite a bit the structure.

X+