add upload function
Merge branch 'master' of github.com:turkotron/snapper-android

* 'master' of github.com:turkotron/snapper-android:
  Add some more stuff

Conflicts:
	src/org/turkotron/snapper/MainActivity.java