lat n lng new implementation. Testing...
gps ok
Merge branch 'master' of
https://github.com/MobileComputing2013/NewSeenIt

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	src/com/example/mobileseenit/InstagramFragment.java
  f
Merge pull request #20 from lyg830/master

upload update
gps working with flickr
raised Justin's gps request time interval to 1 hour
working on settings

Accomplished:
-transferred some main fragment logic from MainActivity to MainFragment
-flickr working with gps, begin-end date and radius
-Settings view now has a datepicker. 
-Added a list that stores links of photos being shown so to avoid
duplicates
 
 Left:
- remove from photoslist all the pictures that shouldn't be displayed
anymore 
- 500px is getting coordinates but doesn't seem to care much (maybe it
gives images without geoloc attributes. Probably is not capable of using
dates to search for images.


Merge branch 'master' of
https://github.com/MobileComputing2013/NewSeenIt

Conflicts:
	res/layout/fragment_settings.xml
	res/values/strings.xml
	src/com/example/mobileseenit/MainActivity.java
	src/com/example/mobileseenit/MainFragment.java
	src/com/example/mobileseenit/PhotoUploadTestFragment.java
	src/com/example/mobileseenit/SettingsFragment.java
	src/com/example/mobileseenit/apis/FlickrSearchTask.java
	src/com/example/mobileseenit/apis/FlickrUploadTask.java
	src/com/example/mobileseenit/helpers/PhotoWrapper.java
forgot about this new file
started doing 500px upload
Merge branch 'master' of https://github.com/MobileComputing2013/NewSeenIt into 500upload

Conflicts:
	project.properties
Merge branch 'master' of https://github.com/edugfilho/NewSeenIt into edugfilho-master

Conflicts:
	project.properties
	src/com/example/mobileseenit/PhotoUploadTestFragment.java
	src/com/example/mobileseenit/apis/PxUploadKeyTask.java
merged eduardos
cleaned up merge crap
fixed bug where image dialogs wouldnt display images