SUCCESS the file is uploaded to the server
Merge branch 'master' of github.com:turkotron/snapper-android

* 'master' of github.com:turkotron/snapper-android:
  Launch camera
  WIP

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