update index
update ember-rails
Merge branch 'e_01' into e_02
Merge branch 'e_02' into e_03
Merge branch 'e_03' into e_04

Conflicts:
	Gemfile.lock
oops