1.1.0
Merge branch 'master' of github.com:urturn/urturn-expression-api

Conflicts:
	dist/iframe.css
	dist/iframe.js
1.1.0 after merging