mocks externalized from http, jsonp added for http
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/insights.min.js
mocks externalized from http, jsonp added for http