Merge branch 'master' of https://github.com/dbaclin/oinoi

Conflicts:
	data-quality/index.php
	data-quality/upload_data.php
Commit after integration of Antoines stuff