Merge pull request #17 from lyg830/master

uploadFragment created & Camera updated
Merge pull request #18 from lyg830/master

uploadFragment updated
Merge pull request #19 from lyg830/master

uploadFragment update
fixed bug where main fragment would always show loading wheel after first view
500px login working. see email for instructions
Getting pictures from 500px now
Added file shells for 500px upload
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.