Merge pull request #26 from nightsprout/dtp/issue-25

avoid duplicating stones, metals, and labors when saving pieces
avoid duplicating stones, metals, and labors when saving pieces
stop showing randomized prices for pieces
Merge pull request #29 from nightsprout/dtp/piece-prices-in-index

stop showing randomized prices for pieces
update associated model ids on server after deleting locally
do it a different way
nope, don't delete new stones/metals/labors right after creating them
formatting and parsing for carat weights
Merge pull request #32 from nightsprout/dtp/carat-weight-formatting

formatting and parsing for carat weights
Merge pull request #31 from nightsprout/dtp/issue-30

update associated model ids on server after deleting locally
Merge branch 'development' of https://github.com/nightsprout/alonmor into zam/image_upload

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/api/pieces_controller.rb