Update Gemfile.lock
Use Ruby 2
Revert "Use Ruby 2"

This reverts commit fbc6a8526d722301e25eecb3cddecf3e3c0b7f3a.
Don't disable Ticket routes in the route config
Bring back TicketsController#show and its view
Show new Ticket pages when they are created
Merge functionality of TicketsController#new into TicketsController#show
Remove the find_ticket method
Remove the errors partial, since simpleform shows prettier error messages
Remove partials, helper methods, and tests for navbar links (they're not in use)
Align the "Admin" link to the right
Use Rails 4.0.0.beta1 instead of edge Rails
Update Gemfile.lock
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	app/controllers/tickets_controller.rb
Use Ruby 1.9.3 in the Gemfile
Replace many config files with those from a brand new Rails 4 app
Add some extra gems for Heroku
Update Gemfile.lock