Resolved confilics with master

Signed-off-by: Marcin Woźniak <y0rune@aol.com>

buisnesslogic/src/main/java/com/plannaplan/services/UserService.java

@@ -34,8 +34,8 @@ public class UserService {
         return token;
     }
 
-    public void save(User user) {
-        this.repo.save(user);
+    public User save(User user) {
+        return this.repo.save(user);
     }
 
     public User getUserByEmail(String email) throws UserNotFoundException {