Setup page function implement

Setup page function implement
submit conflict

submit conflict
Merge branch 'master' of https://github.com/EVRI-TEAM/Evri_Web-Portal

Conflicts:
	WebContent/js/services/webservice.js
commit

commit