Try to clarify adding and setting associations (#5630)

Christoph Werner
2016-04-15T12:56:55+02:00

* Try to clarify adding and setting associations