voronoi
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobilevis/mobilevis_webapp/static/partition.html