Update package.json to ember-data 1.0.0-beta.12
Version 0.1.4
Merge remote-tracking branch 'ember-cli-update/master'

Conflicts:
	app/index.html
Update Pagination to 0.6.1
Update Pagination to 0.6.1
Merge branch 'master' into iriscouch