Merge remote-tracking branch 'refs/remotes/origin/jwc' into ahm
Merge remote-tracking branch 'origin/development' into ahm
Added initial collaboration plugin project
Merge branch 'origin/development'
Merge branch 'clausbn'
Merge branch 'clausbn'
Fixed maven build issue
Added roster to collaboration
Exchanging Objects between Compass instances
Initial implementation of send file between Compass instances
Merge branch 'clausbn'
manually moved version number for collab plugin
Merge branch 'clausbn'
Proof of concept for the collaboration modelling element.
Proof of concept for accept/reject on contract level
Merge branch 'clausbn'
set pass in implicitfunctiondefinitions
Conflicts:
	core/parser/src/main/antlr3/eu/compassresearch/core/parser/Cml.g
Merge branch 'origin/kel'
Merge branch 'origin/kel'