Last minute changes
Merge branch 'zebra' of github.com:geeksoflondon/hamster into zebra

Conflicts:
	app/controllers/zebra/ticket_controller.rb
	app/views/zebra/ticket/new.html.erb