Modificada alguns arquivos js
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	assets/js/criandoBotoes.js
	assets/js/desabilitandoBotoes.js