ignoring stuff
limiting diameter when rectangle chosen

Conflicts:
	public/js/views/Item.js
added id