Merge branch 'tree_comments'

Conflicts:
	app/assets/stylesheets/custom.css.scss