Merge branch 'master' into 'switch-currency-option'

Conflicts:
	source/converter.html
	source/js/converter.js
	source/js/options.js
	source/options.html