fixes scoria and clean code
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	config/locales/statistics.yml