activities fixed
Merge branch 'master' of github.com:Oblify/Server
view updates
Merge branch 'master' of github.com:Oblify/Server