Merge branch 'master' of github.com:MrAJP/S3Backup

Conflicts:
	.gitignore
	S3Backup.sln
	binaries/S3Backup.EventLog.dll
	binaries/S3Backup.S3Uploader.dll
	binaries/S3Backup.exe
	binaries/SevenZipSharp.dll