include url module for heatmap 17
Merge branch 'jetpack' of git://github.com/gregglind/git-testpilot into jetpack
Merge branch 'jetpack' of git://github.com/gregglind/git-testpilot into jetpack
Merge branch 'jetpack' of git://github.com/gregglind/git-testpilot into jetpack
Merge branch 'jetpack' of git://github.com/gregglind/git-testpilot into jetpack

Conflicts:
	extension/lib/tploader.js