fix for services
no turbolink for ember
Merge remote-tracking branch 'origin/master'