Many changes.
Fixed conflict

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