backbone relational with hasone
merged conflicts
removed dropdown element from template