Merge branch 'edl2'

Conflicts:
	app/src/main.cpp
Added an EDL2Edgels algorithm (mostly copy&paste...)