Merge branch 'master' into feature/UrlDisplayText

Conflicts:
	src/cell.js (solved)
Merge branch 'master' of https://github.com/morficus/backgrid

Conflicts:
	src/cell.js