some activities
Merge branch 'master' of https://github.com/sergmor/pajaritoroomie

some activities
user view
merging