Added sliders
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/chrome/profile.js
	src/chrome/settings.js