fix history for ember (remove turbolink from user's layout)
Merge remote-tracking branch 'origin/master'