Model classes of 3 files changed according to tables.
Merge branch 'master' of
https://github.com/rbnelite/vanjariudyogvishwa-v2

Conflicts:
	src/main/java/com/rbnelite/udyogvishwa/dao/EducationWorkDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/EducationWorkDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/model/EducationWork.java
	src/main/java/com/rbnelite/udyogvishwa/model/Occupation.java
Merge branch 'master' of https://github.com/rbnelite/vanjariudyogvishwa-v2

Conflicts:
	src/main/java/com/rbnelite/udyogvishwa/dao/EducationWorkDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/EducationWorkDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/model/EducationWork.java
	src/main/java/com/rbnelite/udyogvishwa/model/Occupation.java
Merge branch 'master' of https://github.com/rbnelite/vanjariudyogvishwa-v2

Conflicts:
	.gitignore
	webapp/WEB-INF/Home.jsp
	webapp/WEB-INF/dispatcherServlet-servlet.xml
Merge branch 'master' of https://github.com/rbnelite/vanjariudyogvishwa-v2

Conflicts:
	src/main/java/com/rbnelite/udyogvishwa/model/EducationWork.java
	webapp/WEB-INF/spring-form.tld
	webapp/WEB-INF/spring.tld
Merge branch 'master' of https://github.com/rbnelite/vanjariudyogvishwa-v2

Conflicts:
	src/main/java/com/rbnelite/udyogvishwa/controller/CommentController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/ContactController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/FamilyController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/HomeController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/IndexController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/LikeStatusController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/NeedController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/OtherDetailsController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/PhotosController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/RelegionController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/StatusController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/UnlikeStatusController.java
	src/main/java/com/rbnelite/udyogvishwa/dao/AstroDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/AstroDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dao/ContactDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/ContactDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dao/FamilyDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/HobbiesDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/HobbiesDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dao/IntrestAreasDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dao/LifeStyleDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/LifeStyleDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dao/NeedDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/NeedDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dao/OtherDetailsDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/OtherDetailsDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dao/RelegionDao.java
	src/main/java/com/rbnelite/udyogvishwa/dao/RelegionDaoImpl.java
	src/main/java/com/rbnelite/udyogvishwa/dto/ContactCredential.java
	src/main/java/com/rbnelite/udyogvishwa/dto/FamilyCredential.java
	src/main/java/com/rbnelite/udyogvishwa/dto/IndexCredential.java
	src/main/java/com/rbnelite/udyogvishwa/dto/NeedCredential.java
	src/main/java/com/rbnelite/udyogvishwa/dto/OtherDetailsCredential.java
	src/main/java/com/rbnelite/udyogvishwa/dto/ReligionCredential.java
	src/main/java/com/rbnelite/udyogvishwa/model/Astro.java
	src/main/java/com/rbnelite/udyogvishwa/model/Contact.java
	src/main/java/com/rbnelite/udyogvishwa/model/EducationWork.java
	src/main/java/com/rbnelite/udyogvishwa/model/Family.java
	src/main/java/com/rbnelite/udyogvishwa/model/Hobbies.java
	src/main/java/com/rbnelite/udyogvishwa/model/Index.java
	src/main/java/com/rbnelite/udyogvishwa/model/LifeStyle.java
	src/main/java/com/rbnelite/udyogvishwa/model/Need.java
	src/main/java/com/rbnelite/udyogvishwa/model/OtherDetails.java
	src/main/java/com/rbnelite/udyogvishwa/model/Religion.java
	src/main/java/com/rbnelite/udyogvishwa/service/AstroService.java
	src/main/java/com/rbnelite/udyogvishwa/service/AstroServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/ContactService.java
	src/main/java/com/rbnelite/udyogvishwa/service/ContactServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/EducationWorkService.java
	src/main/java/com/rbnelite/udyogvishwa/service/EducationWorkServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/FamilyService.java
	src/main/java/com/rbnelite/udyogvishwa/service/FamilyServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/HobbiesService.java
	src/main/java/com/rbnelite/udyogvishwa/service/HobbiesServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/IndexServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/LifeStyleService.java
	src/main/java/com/rbnelite/udyogvishwa/service/LifeStyleServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/NeedService.java
	src/main/java/com/rbnelite/udyogvishwa/service/NeedServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/OtherDetailsService.java
	src/main/java/com/rbnelite/udyogvishwa/service/OtherDetailsServiceImpl.java
	src/main/java/com/rbnelite/udyogvishwa/service/RelegionService.java
	src/main/java/com/rbnelite/udyogvishwa/service/RelegionServiceImpl.java
	webapp/WEB-INF/Step11OtherDetails.jsp
	webapp/WEB-INF/Step2InterestArea.jsp
	webapp/WEB-INF/Step6Family.jsp