use
Merge branch 'master' of git@github.com:kymmehrah/ProjectDev-api.git

Conflicts:
	target/classes/br/com/sparta/entity/TestEntity.class