Merge remote-tracking branch 'my/dev-jshint-compliant' into dev-jshint-compliant

* my/dev-jshint-compliant:

Conflicts:
	intention.js
Merge remote-tracking branch 'my/dev-jshint-compliant' into dev-jshint-compliant

* my/dev-jshint-compliant:

Conflicts:
	intention.js