Fixes bug on not found views for IDI
Changes division/merging computations
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/statistics.yml