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
location kinda works?
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project into newLocationBranch
Location is now properly deserialized from ES.
easy fix
Merge branch 'newLocationBranch' of https://github.com/CMPUT301F14T14/Project

Conflicts:
	QuestionApp/res/layout/addquestiondialogfragmentlayout.xml