fixed framework errors / line is still not displayed properly
Merge branch 'master' of https://github.com/fafilipp/tprj-msi-ss13

Conflicts:
	experiments/draw2d/shapesJSON.html