removed single table inheritance
Merge branch 'polygon'

Conflicts:
	db/schema.rb