Line Detection + Intersection
Merge branch 'cw' of https://github.com/matoilic/thesis into cw

Conflicts:
	Applications/Applications.pro