Update to the ember template compiler to v1.3.0 and handlebars to v1.2.1.
The replace argument should be a regular expression or a string — not
a string containing a regular expression.
Fix merge conflict