camera update
Merge pull request #1 from lyg830/myCamera

camera update
Added stubs for each fragment
Added network permissions to manifest. Added flickr jar
Merge pull request #2 from MobileComputing2013/Flickr

Added network permissions to manifest. Added flickr jar
add
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs