Edit nodes
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/fresend/template.php