Atualizando manifesto e arquivo de update.xml
Merge branch 'master' of https://github.com/khiby/Controle-ponto

Conflicts:
	manifest.json