fix
missing semicolon
update ember versions
weird json fix
Merge branch 'e_01' into e_02

Conflicts:
	Gemfile
1.0 changes
underscoring
Merge branch 'e_01' into e_02

Conflicts:
	app/assets/javascripts/templates/index.handlebars
re-underscoring