fixed merge conflicts from ios5 patch
fixed merge conflicts from ios5 patch

peterjm/turbolinks,maclover7/turbolinks,jnillo/turbolinks,bmxpert1/turbolinks,saboyutaka/turbolinks,rstacruz/turbolinks,lepture/turbolinks,ngpestelos/turbolinks,activebridge/turbolinks,Novik/turbolinks,jvenezia/turbolinks,saboyutaka/turbolinks,ngpestelos/turbolinks,glittershark/turbolinks,caulfield/turbolinks,schneidmaster/rails-turbolinks,celsodantas/turbolinks,savef/turbolinks,Novik/turbolinks,rails/turbolinks,celsodantas/turbolinks,monkbroc/turbolinks,Thibaut/turbolinks,johnnyshields/turbolinks,monkbroc/turbolinks,jdurand/turbolinks,missive/turbolinks,monkbroc/turbolinks,mizchi/turbolinks,gmalette/turbolinks,rails/turbolinks,mizchi/turbolinks,elia/turbolinks,missive/turbolinks,missive/turbolinks,imton/turbolinks,hooopo/turbolinks,lfender6445/turbolinks,elia/turbolinks,saboyutaka/turbolinks,maclover7/turbolinks,Shopify/turbolinks,savef/turbolinks,Novik/turbolinks,infinum/turbolinks,celsodantas/turbolinks,jasnow/turbolinks,fukayatsu/turbolinks,saboyutaka/turbolinks,Thibaut/turbolinks,LOTSIX/Turbolinks,jasnow/turbolinks,porras/turbolinks,peterjm/turbolinks,dvdhsu/turbolinks,mariovisic/turbolinks,jho406/turbolinks,imton/turbolinks,garbles/turbolinks,naveed-ahmad/turbolinks,jasnow/turbolinks,smd686s/turbolinks,dgladkov/django-turbolinks,rstacruz/turbolinks,LOTSIX/Turbolinks,mizchi/turbolinks,activebridge/turbolinks,eileencodes/turbolinks,savef/turbolinks,rstacruz/turbolinks,tomichj/turbolinks,ngpestelos/turbolinks,gmalette/turbolinks,caulfield/turbolinks,naveed-ahmad/turbolinks,arigesher/turbolinks,christhekeele/turbolinks,jnillo/turbolinks,turbolinks/turbolinks-classic,jvenezia/turbolinks,rails/turbolinks,gmalette/turbolinks,celsodantas/turbolinks,twalpole/turbolinks,jvenezia/turbolinks,fs/turbolinks,caulfield/turbolinks,schneidmaster/rails-turbolinks,envato/turbolinks,jho406/turbolinks,bmxpert1/turbolinks,naveed-ahmad/turbolinks,turbolinks/turbolinks-classic,WojtekKruszewski/turbolinks,maclover7/turbolinks,woto/turbolinks,glittershark/turbolinks,linesarefuzzy/turbolinks,marcamillion/turbolinks,Novik/turbolinks,DrewMartin/turbolinks,arigesher/turbolinks,jho406/turbolinks,christhekeele/turbolinks,reed/modular-turbolinks,arigesher/turbolinks,monkbroc/turbolinks,imton/turbolinks,missive/turbolinks,jvenezia/turbolinks,maclover7/turbolinks,smd686s/turbolinks,brandleadership/turbolinks-offline,ngpestelos/turbolinks,imton/turbolinks,elia/turbolinks,rstacruz/turbolinks,WojtekKruszewski/turbolinks,elia/turbolinks,savef/turbolinks,jasnow/turbolinks,gmalette/turbolinks,hexacyanide/turbolinks,Thibaut/turbolinks,activebridge/turbolinks,naveed-ahmad/turbolinks,garbles/turbolinks,Thibaut/turbolinks,activebridge/turbolinks,turbolinks/turbolinks-classic,rails/turbolinks,WojtekKruszewski/turbolinks,mirego/turbolinks,smd686s/turbolinks,caulfield/turbolinks,WojtekKruszewski/turbolinks,philiptzou/turbolinks,jho406/turbolinks,schneidmaster/rails-turbolinks,screenconcept/turbolinks-offline,DrewMartin/turbolinks,schneidmaster/rails-turbolinks,jnillo/turbolinks,mizchi/turbolinks,smd686s/turbolinks,timruffles/turbolinks,Ju2ender/turbolinks,jnillo/turbolinks,arigesher/turbolinks,turbolinks/turbolinks-classic