Cleanup Lens main script.

Up to now, we have duplicated this file to create modified versions.
This change introduce a proper architectural approach.
Merge branch 'master' into lens_next

Conflicts:
	src/lens.js