componentize the table using Ember.Component
fixed merge conflict