tab content background
activity feed update
Merge branch 'testing' of https://github.com/sharewave/frontus into testing
Merge branch 'julia' into testing

Conflicts:
	documents/css/company.css