Adding ormdatasource to settings.ini.cfm
Merge branch 'candidate' of github.com:blueriver/MuraCMS into candidate
Fix for issue #1706
Merge branch 'candidate' of github.com:blueriver/MuraCMS into candidate