fix
Merge branch 'master' of https://github.com/signumsoftware/framework

Conflicts:
	Signum.Web/Signum/Scripts/Lines.js
	Signum.Web/Signum/Scripts/Lines.ts