Merge remote-tracking branch 'WxT/master' into feature-chart-graph

Conflicts:
	src/js/settings.js