Layout for Ticket Show Page Modified
Routes Added
Merge branch 'master' of https://github.com/cogn/damp

Conflicts:
	app/views/tickets/index.html.erb
	config/routes.rb