Fixed photo activity so it sends a photo taken from camera
Merge branch 'master' of https://github.com/mlidge/tweak-the-tweet

Conflicts:
	TweaktheTweet/bin/TweaktheTweet.apk
	TweaktheTweet/bin/classes.dex
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/LocationWithGPS.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilder.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderCategory.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm$1.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm$2.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm$3.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm$4.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm$5.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm$6.class
	TweaktheTweet/bin/classes/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm.class
	TweaktheTweet/src/uw/changecapstone/tweakthetweet/PhotoActivity.java
	TweaktheTweet/src/uw/changecapstone/tweakthetweet/TestStringBuilderConfirm.java