updates from live 2
Updates from live 2

Conflicts:
	dd-arrets.php
	logs/log.txt
	public/class-dd-arrets.php