Laatste commit
Merge branch 'master' of https://github.com/henrilouis/ibrowse

Conflicts:
	js/view/barGraphView.js