before conflict
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	remote/Hosts.class.php