synchro du weekend
Merge branch 'master' of https://github.com/GlasSwarm/adloop

Conflicts:
	models/inc/function.php