Merge branch 'master' into devel
Update install-cards.sh
Update funcoes.sh
Update install-cards.sh
Merge branch 'devel'

Conflicts:
	install/install-cards.sh
18072014-1627