test
Merge branch 'master' of https://github.com/octavian001/Hibernate-USM-

Conflicts:
	auto/src/main/java/com/service/auto/AUTO.java
	auto/src/main/java/com/service/auto/BON.java
	auto/src/main/java/com/service/auto/Factory.java
	auto/src/main/java/com/service/auto/MARCA.java
	auto/src/main/java/com/service/auto/MECANIC.java
	auto/src/main/java/com/service/auto/MODEL.java
	auto/src/main/java/com/service/auto/Main.java
	auto/src/main/java/com/service/auto/OPERATIE.java
	auto/src/main/java/com/service/auto/PIESE.java
	auto/src/main/java/com/service/auto/PROPRIETAR.java
	auto/target/classes/META-INF/maven/com.service/auto/pom.properties
	auto/target/classes/com/service/auto/AUTO.class
	auto/target/classes/com/service/auto/BON.class
	auto/target/classes/com/service/auto/Factory.class
	auto/target/classes/com/service/auto/MARCA.class
	auto/target/classes/com/service/auto/MECANIC.class
	auto/target/classes/com/service/auto/MODEL.class
	auto/target/classes/com/service/auto/Main.class
	auto/target/classes/com/service/auto/OPERATIE.class
	auto/target/classes/com/service/auto/PIESE.class
	auto/target/classes/com/service/auto/PROPRIETAR.class