Updated Location Activity
Merge branch 'master' of https://github.com/CMPUT301W14T12/GeoChan

Conflicts:
	res/layout/activity_location.xml
	res/values/strings.xml
	src/ca/ualberta/cs/views/LocationActivity.java
Location Activity updates
Linking edit post activity to location activity
Updated UserModel

Added upVoteList and downVoteList
Adjusted row
Pushed PostViewActivity for Phteven
Deleted PostViewController and VoteStatusList
Fixed a crash I had introduced
Fixed negative error

Displayed two negative symbols when votes were below 0
Bug fixing
Merge branch 'master' of https://github.com/CMPUT301W14T12/GeoChan
Updated upVote and downVote

May have broken things
Got location working
Fixed upVote and downVote buttons.

Full functional now
Merge branch 'master' of https://github.com/CMPUT301W14T12/GeoChan
Stupid GitHub for Windows. Nows its fixed
Merge commit '08415246874eed73f0eba9a65187840eb0b3e0b5' into providerRefactor
Added some more controls
Improved stack.

* Moved control singleton to own method
* Changed selection method to a stacked approach
* Fixed "back" navigation