minor changes
Solved conflict

Conflicts:
	js/parallel_coords.js