Merge branch 'master' of https://github.com/Addepar/ember-table

Conflicts:
	package.json
Fixed issue with ember templates
Another issue with ember templates fixed
Merge remote-tracking branch 'origin/master' into v2

Conflicts:
	package.json