stable 0.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/generated-sources/annotations/br/gov/ms/saude/olapses/entity/AbstractEntity_.java
	target/generated-sources/annotations/br/gov/ms/saude/olapses/entity/Assunto_.java
	target/generated-sources/annotations/br/gov/ms/saude/olapses/entity/Indicador_.java
	target/maven-archiver/pom.properties
	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
Merge remote-tracking branch 'origin/master'

Conflicts:

	target/generated-sources/annotations/br/gov/ms/saude/olapses/entity/AbstractEntity_.java

	target/generated-sources/annotations/br/gov/ms/saude/olapses/entity/Assunto_.java

	target/generated-sources/annotations/br/gov/ms/saude/olapses/entity/Indicador_.java
	target/maven-archiver/pom.properties

	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst