# Conflicts:
#	cmsWebApp/src/performa/utils/Utils.java
#	cmsWebApp/webroot/extensions/adminportal/inc/application_list_data.jsp
#	cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp
#	cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp
#	cmsWebApp/webroot/extensions/adminportal/inc/view_application_tab_applicant.jsp
#	cmsWebApp/webroot/extensions/adminportal/sign_in.jsp
#	cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
#	cmsWebApp/webroot/extensions/adminportal/view_applicantss_grid.jsp
#	cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp
#	cmsWebApp/webroot/extensions/applicantportal/inc/htmlheader.jsp
#	cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp
#	cmsWebApp/webroot/extensions/applicantportal/job_overview.jsp
#	cmsWebApp/webroot/extensions/applicantportal/selection_criteria.jsp
#	cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp
#	cmsWebApp/webroot/extensions/applicantportal/submit_application.jsp
#	cmsWebApp/webroot/extensions/applicantportal/verify_identity.jsp
#	cmsWebApp/webroot/extensions/applicantportal/workplace_culture.jsp

Restricted own role change for user who created the company.

Sign In Changes reverted as functionality is not totally merged yet, Script removed as another script was already added for the same.

Row - Job - Update job status - No matter the existing status, Draft is never an option; only the app can set a job to Draft | If status is Open, available statuses are Closed or Filled | If status is Closed, available status is Filled | If status is Filled, status _cannot be updated_

Login verification updated applicant/admin.

Bugfix: Candidate can apply for same job multiple times if application not yet saved and opened in new tab.

showing client name and client logo to admin portal and applicant portal. Allowing users to select a client when creating a job.