edit entityManager
Edit EntityFactory
solve conflict
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/com/ita/edu/softserve/dao/impl/LinesDAOImpl.java
	src/main/java/com/ita/edu/softserve/main/Main.java