Move rbs-todo to Rbs_Dev + locale fixes