local
Merge branch 'master' of github.com:jdsolucoes/Meli

Conflicts:
	ng_tests.py