added turbolinks
merged master