added prices;
fixed prices logic/schema
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models.py