histogram
Merge branch 'master' of https://github.com/projects4PB/biomet

Conflicts:
	src/biomet/managers/EditorManager.java
	src/biomet/panels/RootPanel.java