update rails
Merge branch 'master' of github.com:wirelab/zendesk_ticket

Conflicts:
	zendesk_ticket.gemspec