made card dragging work in js with new layout
Made add occasion button work
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/occasion.rb
	app/models/order.rb

merge origin and Nick's javascript work.