arranging2
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/Piece.js
	js/Sector.js
	js/main.js
first fixup