Merge (line-endings problem?)
Another merge...
Added properties and labels to the link and link shape classes.
The current implementation has performance issues and problems with duplicated text on moving the links around.
Merge branch 'master' of https://github.com/JoostvanPinxten/eugenia-live

Conflicts:
	app/controllers/simulations.coffee
	app/models/drawing.coffee
	app/models/link_shape.coffee
	app/views/palettes/define.eco
	deploy-epsilon.sh
	deploy.sh