started doing 500px upload
Merge branch 'master' of https://github.com/MobileComputing2013/NewSeenIt into 500upload

Conflicts:
	project.properties