Setup page

Setup page
Submit

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

Conflicts:
	WebContent/charityregistration.html
	WebContent/js/controllers/charityregistration.js