v1.1.0
Merge branch 'master' into gh-pages

Conflicts:
	templates/compiled.js