#api tisséo et google récupérée
Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	api/Decaux.php
	api/Tisseo.php
	index.php
	model/Database.php
	model/Velo.php
	toolkit/Toolkit.php
	unlike.php