modify tickets and ticket interactions
fix timers
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb

	modified:   config/routes.rb
	new file:   db/migrate/20140624021656_create_interaction_events.rb
	new file:   db/migrate/20140624022038_add_interaction_events_to_interactions.rb
	modified:   db/schema.rb