update on devise and ember
update on devise and ember
update on devise and ember
resolving conflicts