vis
Merge branch 'Sprint1' of github.com:anis-moubarik/dspacevisual into Sprint1

Conflicts:
	javascripts/visualization.js
comeon
Merge branch 'Sprint1' of github.com:anis-moubarik/dspacevisual into Sprint1

Conflicts:
	javascripts/visualization.js