trim
Merge branch 'develop' of github.com:lahaxearnaud/cook-bookmarks into develop

Conflicts:
	app/libraries/Extractors/AbstractExtractor.php