bar chart with multiple series, show bars side by side
Add color property at serie objects
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/web/js/zkflot/MaChart.js
	src/test/java/test/ctrl/DemoWindowComposer.java