Merge branch 'sprint15'

Conflicts:
	pilot/view/script/script.js