Merge branch 'develop'

Conflicts:
	Gruntfile.js
	insight.js.zip