update to ember pre4
update to ember pre4
seed data
update to data
Merge branch 'e_01' into e_02

Conflicts:
	Gemfile