Complete liking venues feature
Correct typo in city view
Complete merge