Added back in ef-*-intro.html files
Merge branch 'dev'