Merge e inclusão de favoritos no JS
Merge branch 'master' of https://github.com/robertojunior/argos into faru-master

Conflicts:
	html/favoritos.html
	html/instancias.html
	html/popup.html
	js/instances.js
	js/tabs.js
Merge branch 'faru-master'
Merge branch 'master' of https://github.com/jorgepgjr/argos into jorge-master
Merge branch 'jorge-master'
ajustes merge
ajustes favoritos