return to Javi Branch
Added test to check de ID value on punishment entity
Merge branch 'gorka' of https://github.com/Upplication/The-Punisher.git into gorka