Changed tabs to spaces and made logic the same as the previous update (&& instead of ||).
Merge pull request #742 from gabrielnahmias/master

Update qqFileUploader.php
fixes after repo xfer
adjustment after repo xfer
repo xfer - license change
repo xfer - license change
repo xfer - license change
repo xfer - license change
no longer considering removal of IE7 support
repo xfer - license change
repo xfer - license change
repo xfer - license change
remove server dir
link to fine-uploader-server repo
update readme location
Merge branch 'master' into 3.4-IP

Conflicts:
	build.gradle
	readme.md