stop functions
Merge branch 'master' of https://github.com/vgaviria/leopard_strike

Conflicts:
	ext_test/inject_ext/client.js