merge
merge
Merge remote-tracking branch 'origin/HEAD' into HEAD
changed behave of FTP file upload to --> only upload if connected with
WIFI