added the photo taking stuff.
merged with trunk.
adde upload button.