Merge branch 'uat' of github.com:hbaragar/Conference-Management-Application into uat
Minor name changes for confero related methods.
Merge branch 'uat'