quick fix for statistics
some fixes
fix
some fixes and cleaning
Merge branch 'version_3_2' into version_3_3

Conflicts:
	db/schema.rb