fix #3 . Solution suggested by dsaywer in his for of live-templates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	live-templates.js

merged changes from upstream