merged and changes
changes
changes
changes
Merge remote-tracking branch 'origin/recruiter-and-registration-v2' into
recruiter-and-registration-v2

Conflicts:
	src/main/java/com/softtech/web/controller/RegistrationController.java
	src/main/java/com/softtech/web/form/Registration.java
	src/main/java/com/softtech/web/service/RegistrationService.java
	src/main/java/com/softtech/web/service/impl/RegistrationServiceImpl.java
	src/main/java/com/softtech/web/util/RegistrationUtil.java
	src/main/webapp/WEB-INF/views/common.html
	src/main/webapp/WEB-INF/views/register/complete-your-info.html
	src/main/webapp/WEB-INF/views/register/register.html
	src/main/webapp/WEB-INF/views/register/select-job.html
	src/main/webapp/css/style.css