merge with we.js emberjsDev branch