Better clearfix.
Use master branch.
Fix regression.
Merge branch 'master' of https://github.com/elifesciences/lens
Merge branch 'master' into lens_next

Conflicts:
	project.json