comments file upload
initial hard-coded user activity implementation
bug fix? city_location
Merge commit '019b2'