Fix for WK-90: Add Incoming/Outgoing Link are empty
View model using straight lines by default
Fix WK-90
Merge branch 'development'

Conflicts:
	src/main/webapp/version.jsp
Merge branch 'development'