Merge branch 'master' of https://github.com/hsmatis/ftp_upload

Conflicts:
	.gitignore
	FTP_Upload/src/runtimesettings.py
Merge remote-tracking branch 'origin/master'