Update (Backend)

- updates the link view and link model to show the whiteboard that it
is being linked to.
Merge branch 'master' of https://github.com/gabrielcsapo/Final-Project-COS_210

Conflicts:
	src/edu/mccc/cos210/fp2014/col/client/network/NetworkManager.java