Refacto
Refacto
Merge branch 'refacto'

Conflicts:
	Controller/MetadataController.php