Bump version
Don't copy Handlebars.templates to Thorax.templates
Use background-loading helper on book-slot page
Merge branch 'master' into template-registry
Alias: Thorax.template = Handlebars.templates
Merge pull request #126 from walmartlabs/template-registry

Don't copy Handlebars.templates from Thorax.templates
Backport handlebars escapeExpression fixes
Always reset _rendering flag
Merge branch 'release/avery'

Conflicts:
	components/phoenix/js/view-android-number.js
	styles/home.styl
Merge branch 'asda-merge'
Use $el when available
Refactor collection tests
Move a few collection helper tests
Do not rerender model by default
shouldRender helper
Defer collection rendering
Merge branch 'master' into defered-render

Conflicts:
	test/src/collection.js
Fix unit tests
Add default comments
Update docs on new view APIs