Add work on extension
Merge remote-tracking branch 'origin/master'

Conflicts:
	ext/history.html
	ext/src/history.js