Feature/emberjs integration