fixed some issues of setup page

fixed some issues of setup page
Merge branch 'master' of https://github.com/EVRI-TEAM/Evri_Web-Portal

Conflicts:
	WebContent/css/custom.css