Fixed location of adding location to the user profile
Merge branch 'MapBranch' of https://github.com/CMPUT301F14T08/StackUnderflow into SearchAdditions
some refactoring, fixed various bugs/outstanding issues