Merge branch 'share' of https://github.com/aledeg/FreshRSS into share

Conflicts:
	app/Models/Configuration.php