Ajustes, scrollbars
Merge origin/master

Conflicts:
	public/css/style.css