added javascript
Update .gitignore
Merging updates with master
Merging master with leo
Finishing branch merging
Merge branch 'master' into leo-alocacao

Conflicts:
	siar/src/main/java/br/com/siar/services/FornecedorSiarService.java
	siar/target/m2e-wtp/web-resources/META-INF/maven/br.com/siar/pom.properties