WIP
WIP
WIP
WIP
WIP
Added notes
Merge branch 'ember-symposium'
Merge branch 'master' into gh-pages