Merge origin/master

Conflicts:
	src/flicr/FileToUpload.java
Merge origin/master

Conflicts:
	src/flicr/FileToUpload.java