Add #45 and fix image scaling for height/width
add further smiley filters because SA...
Merge pull request #46 from nskillen/dev

added ability for SALR to set image tooltip based on image filename
Fix one tooltip bug and add one new setting
2.1.0 release
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	extension/js/message-handler.js
	extension/js/salr.js
	extension/settings.html