refactoring
Merge branch 'master' into using_raphael

Conflicts:
	Visualizer/js/Analyzer.js