Add pusher-gem to Gemfile.
Merge remote-tracking branch 'origin/event++' into realtime
add the pusher config
started seating diagram
updates OrderController.rb
adds pusher's javascript library
cleans up seats method
Merge remote-tracking branch 'origin/develop' into eventseating
fixes plural
adds seats route
Merge branch 'refs/heads/develop' into realtime

Conflicts:
	app/controllers/orders_controller.rb
Merge remote-tracking branch 'origin/search' into realtime

Conflicts:
	Gemfile
canvas displays and seats collection works
Merge branch 'develop' of https://github.com/TheConstructors/QwikStubs into eventseating
Merge remote-tracking branch 'origin/search' into realtime
add pusher events to order model
fix Order model associations and channel triggers
Merge remote-tracking branch 'origin/develop' into realtime

Conflicts:
	app/models/event.rb
add pusher to application.js
Merge branch 'develop' of github.com:TheConstructors/QwikStubs into realtime