Upgraded to Rail 2.3.18
Merge branch 'uat' of github.com:hbaragar/Conference-Management-Application into uat