backing out the previous commit
Merge branch 'master' into feature/UrlDisplayText

Conflicts:
	src/cell.js (solved)