* Fixed rights in database.
* Fixed merge conflicts.
* Fixed merge conflicts

Conflicts:
	UserService/pom.xml
	UserService/src/main/java/aidas/userservice/entities/RoleEntity.java
	UserService/src/main/java/aidas/userservice/entities/UserEntity.java