comments file upload
Merge pull request #19 from prsnca/master

updates from Yaron
Merge pull request #20 from prsnca/master

registration form and upload form fixed
initial hard-coded user activity implementation
bug fix? city_location
Merge commit '019b2'
Merge pull request #19 from itayB/master

updates