? no mesmo arquivo do teste do ubuntu
Merge remote-tracking branch 'origin/master'
456
Merge remote-tracking branch 'origin/master'

Conflicts:
	docnizer/src/main/java/com/bygorillas/docnizer/service/util/ServiceLog.java
teste
Alteraçãos para teste de layout.
Merge remote-tracking branch 'origin/master'
Adicionando bootstrap
Teste
Merge remote-tracking branch 'origin/master'