ab
Merge branch 'master' of https://github.com/rbnelite/vanjariudyogvishwa-v2

Conflicts:
	src/main/java/com/rbnelite/udyogvishwa/controller/EducationWorkController.java
	src/main/java/com/rbnelite/udyogvishwa/model/Astro.java
	webapp/WEB-INF/.gitignore
	webapp/WEB-INF/Step7Astro.jsp
	webapp/WEB-INF/Step8EducationWork.jsp
	webapp/resources/mytheme/css/style.css
ab commit
Merge branch 'master' of https://github.com/rbnelite/vanjariudyogvishwa-v2

Conflicts:
	src/main/java/com/rbnelite/udyogvishwa/controller/AstroController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/EducationWorkController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/HobbiesController.java
	src/main/java/com/rbnelite/udyogvishwa/controller/OccupationController.java
	src/main/java/com/rbnelite/udyogvishwa/dto/AstroCredential.java
	src/main/java/com/rbnelite/udyogvishwa/service/AstroServiceImpl.java
	webapp/WEB-INF/Profile.jsp
	webapp/WEB-INF/Step10Hobbies.jsp
	webapp/WEB-INF/Step11OtherDetails.jsp
	webapp/WEB-INF/Step7Astro.jsp
	webapp/WEB-INF/Step8EducationWork.jsp
	webapp/resources/mytheme/css/style.css
validation Commit