added ember application
after merger