ember app template added
Merge branch 'ember'