Change json serializer
Change to Oj serializer
Update emberjs
Small fixes