Added jquery turbolinks
Resolved merge conflicts