deprecated comments
identation
Merge branch 'local' of https://github.com/matheusmessora/mamute into local

Conflicts:
	src/integration/java/org/mamute/util/DataImport.java