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

Conflicts:
	src/br/com/sparta/entity/TestEntity.java
	target/classes/br/com/sparta/entity/TestEntity.class
Merge branch 'master' of git@github.com:kymmehrah/ProjectDev-api.git