Merge branch 'develop' into feature/graph/animate

Conflicts:
	app/assets/javascripts/views/raphael.cell.js.coffee
	app/assets/javascripts/views/raphael.graph.js.coffee
Merge branch 'feature/graph/animate' into develop
Pane doesnt retract on resize