Hannah Wolfe 79a333b480 Merge branch 'master' into ember ... Conflicts: bower.json core/client/views/editor.js		2014-03-16 20:52:44 +00:00
..
modals	Merge branch 'master' into ember	2014-03-16 20:52:44 +00:00
settings	Merge branch 'master' into ember	2014-03-05 23:10:44 +00:00
forgotten.hbs
list-item.hbs
login.hbs
modal.hbs
notification.hbs
preview.hbs
reset.hbs
signup.hbs