delete turbolinks
Merge branch 'master' into dev_alberto

Conflicts:
	app/views/layouts/application.html.erb
Fix merge
Merge branch 'dev_alberto'