clean up et refactor
Merge branch 'test-refactor-activity-provider'

Conflicts:
	src/Tempo/Bundle/MainBundle/Resources/less/bundles.less