friends on web
add profile page
update page
friends api
Merge branch 'master' of github.com:Shvarts/Cashhoppers
doc
users api
update tests and factory
Merge branch 'master' of github.com:Shvarts/Cashhoppers
fixing bugs
Merge branch 'master' of github.com:Shvarts/Cashhoppers
spec for friendship model
add new fields to user && update prifile api
api: events list and upload hop task
three types of admin
merge and resolve conflicts
merge with master and resolve conflicts