Adding ormdatasource to settings.ini.cfm
Merge branch 'candidate' of github.com:blueriver/MuraCMS into candidate
Merge pull request #1708 from stevewithington/candidate

bug fix: issue #1581
Fix for issue #1706
Merge branch 'candidate' of github.com:blueriver/MuraCMS into candidate
Moving older soap api code
Adding new api package
Typo ine error message
Remove deprecated table markup from CKeditor HTML

Goal: disallow cellspacing, cellpadding and border attributes on <table>
tags in CKeditor markup. This is deprecated HTML and interferes with
table rules in Bootstrap and other CSS libraries.
Fix: allow all content (as the "CKEDITOR.dtd" object) , then disallow
specific attributes on the <table> tag.
Merge pull request #1712 from gowestweb/candidate

Typo ine error message