updating ember to RC3
Merge branch 'e_01' into e_02

Conflicts:
	Gemfile
Merge branch 'e_02' into e_03
fix
Merge branch 'e_03' into e_04

Conflicts:
	Gemfile.lock