Blabla
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/com/ing/streaming/dashboard/line.html
	src/main/scala/com/ing/streaming/dashboard/line.js
Blabla