fix text formatting
formatting
css changes
more css
add spacing
add ng-class
fix conditional
Fix merge conflict, merge people activity with css
Merge branch 'testing' of https://github.com/sharewave/frontus into testing