Funcionalitats votacions
Funcionalitats Votacions acabades
Funcionalitats votacions
Funcionalitats Votacions acabades
.
Merge branch 'sistemaVotacions' of
https://github.com/TripBoxDev/TB_Backend.git into sistemaVotacions

Conflicts:
	src/main/java/com/tripbox/services/GroupServiceImpl.java
	src/main/java/com/tripbox/services/UserServiceImpl.java
Branca pel merge
Merge branch 'sistemaVotacions+test'

Conflicts:
	src/main/java/com/tripbox/api/GroupRESTImpl.java
	src/main/java/com/tripbox/api/interfaces/GroupREST.java
	src/main/java/com/tripbox/services/GroupServiceImpl.java
	src/main/java/com/tripbox/services/interfaces/GroupService.java