Use emberjs/ember.js and emberjs/data master branches

Branches from 130319:
  ember.js a1cbd22fefba07a9e782453cb71b560a89d97507
  data 57d6c01cd23f22150cbc27774a79c0f7a2cdee8d

Conflicts:
	index.html
	js/app.js