merge myself up
Merge branch 'master' of https://github.com/Panfloss/xbmc-ftp-sync-addon

it's needed