add 500px as dependency
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project.properties
properties conflict
upload update

ui update
checkboxes for Flickr and 500px added.
Merge pull request #20 from lyg830/master

upload update