James Work (2) 17.10.14

- link plugin changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebPortal/content/javascript/editMainPage.js