thumbnail in answer works
nothing much
merge conflicts
Comment on some things
Merge pull request #203 from CMPUT301F14T14/newLocationBranch

Comment on some things
Clean up android manifest
still stuck
Make image serialization work.

This required fixing up the image class, and the things that use it.
@lamorie, this might merge-conflict with your stuff, but it will make
your life much easier.
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
Add image to the deserializers so we can read data from ES
Merge pull request #204 from stephenjust/images

Images
Update test case
things dumb people do
Merge branch 'images'

Conflicts:
	QuestionAppTests/src/ca/ualberta/cs/cmput301f14t14/questionapp/test/ImageTest.java
thumbnail on question working
Fix test compilation
Added docs to Callback interface
First batch of refactoring and commenting for ClientData class.
thumbnails all working
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project