Edge styles assigned to edges
Merge branch 'programmaticStyles' of github.com:MDCox/Alchemy-1 into MDCox-programmaticStyles
Merge branch 'MDCox-programmaticStyles' into release-0.3

Conflicts:
	app/scripts/alchemy/models/edge.coffee