fix
Merge branch 'master' of https://github.com/katalym/dev

Conflicts:
	piwigo_sync_tree.pl
ff