Merge branch 'window_sizes'

Conflicts:
	source/js/background.js