Update GreetingController.java
Merge branch 'master' of https://github.com/jorgevs/MyRestHibernateProject.git
version 1.2
Merge remote-tracking branch 'origin/master'
NewDaoLayer
NewDaoLayer version 1.1
Merge remote-tracking branch 'origin/NewDaoLayer'

Conflicts:
	src/main/java/com/jvs/rest_hibernate/controller/RestOffersController.java
	src/main/java/com/jvs/rest_hibernate/dao/BaseDao.java
	src/main/java/com/jvs/rest_hibernate/dao/BaseDaoImpl.java
	src/main/java/com/jvs/rest_hibernate/dao/OfferDaoImpl.java
	src/main/java/com/jvs/rest_hibernate/dao/OffersDao.java
	src/main/java/com/jvs/rest_hibernate/dao/PersonDao.java
	src/main/java/com/jvs/rest_hibernate/dao/PersonDaoImpl.java
	src/main/java/com/jvs/rest_hibernate/dao/UserDao.java
	src/main/java/com/jvs/rest_hibernate/dao/UserDaoImpl.java
	src/main/java/com/jvs/rest_hibernate/entity/BaseEntity.java
	src/main/java/com/jvs/rest_hibernate/entity/Greeting.java
	src/main/java/com/jvs/rest_hibernate/entity/Offer.java
	src/main/java/com/jvs/rest_hibernate/entity/Page.java
	src/main/java/com/jvs/rest_hibernate/service/OffersService.java
	src/main/java/com/jvs/rest_hibernate/service/OffersServiceImpl.java
	src/main/java/com/jvs/rest_hibernate/service/PersonService.java
	src/main/java/com/jvs/rest_hibernate/service/PersonServiceImpl.java
	src/main/java/com/jvs/rest_hibernate/service/UserService.java
	src/main/java/com/jvs/rest_hibernate/service/UserServiceImpl.java
	src/main/webapp/WEB-INF/views/Offers/createOffer.jsp
	src/test/resources/beansTest.xml