Add prices and promotions for a given show
Add show status to admins backend
Add description to promotion
Merge pull request #16 from jbarreneche/feature/show-status

Add show status to admins backend
Merge pull request #19 from jbarreneche/feature/prices-and-promotions

Add prices and promotions for a given show
Merge remote-tracking branch 'origin/master' into feature/reservations-and-purchases

Conflicts:
	app/admin/show.rb
	app/models/price_setting.rb
	app/models/promotion.rb
	app/models/room_status.rb
	app/models/seat.rb
	app/models/show.rb
	config/locales/models.es.yml
	db/schema.rb