Merge remote-tracking branch 'origin/master' into feature/Integrate_publipostage_table_management

Conflicts:
	api/docs.rb
	api/ressource.rb
	model/etablissement.rb
	model/init.rb
	tasks/db.rake