ZtestowanaBazaDziala
Merge remote-tracking branch 'origin/master'

Conflicts:
	logs/logs.log
	src/main/java/model/dao/OfferDao.java
	src/main/java/model/entity/OfferEntity.java
	src/main/java/model/service/MainServiceBean.java
	src/main/java/model/service/OfferService.java
	src/main/resources/beans.xml
	src/main/resources/sql/1_table.sql
	src/main/resources/sql/2_sequence