I don't know why it wants this done...
Merge branch 'master' of https://github.com/ACLay/TATupload.git

Conflicts:
	src/uk/org/sucu/tatupload/TatUploadApplication.java