Another version of the package json
Merge branch 'develop' of https://github.com/BorjaL/Rest-API-gamification into develop

Conflicts:
	package.json