updated ids to names
Merge branch 'master' of github.com:ohthanks/pwp-orderpads

Conflicts:
	app/templates/item.html