merge
Merge branch 'master' of https://github.com/jordannick/shuttle

Conflicts:
	Resources/webview.js