Merge branch 'statistics_design' of https://github.com/SansPseudoFix/diaspora into statistics_design

Conflicts:
	app/views/statistics/statistics.html.haml