weights scrubbing
whythefuck
forshiggles
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/bootstrap/js/bootstrap-collapse.js
	public/bootstrap/js/bootstrap-transition.js
	views/chat_settings.ejs