More location things
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
All the location things
Add things to help serialize
Add a 'search nearby' method
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project into newLocationBranch
bullshit location fuck
Beautiful shit
thumbnail in answer works
location kinda works?
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project into newLocationBranch
Location is now properly deserialized from ES.
Merge pull request #198 from lamorie/master

Thumbnail numero uno...finally
easy fix
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project

Conflicts:
	QuestionApp/res/layout/addquestiondialogfragmentlayout.xml
nothing much
merge conflicts
Comment on some things
Merge pull request #203 from CMPUT301F14T14/newLocationBranch

Comment on some things