Finished form data client side grouping
Merge branch 'master' of https://github.com/EVRI-TEAM/Evri_Charity-Portal.git
Changed ng-show to ng-if in portal.html