Merge remote-tracking branch 'origin/clip-path'

Conflicts:
	index.html
	js/app/app.js