update navbar.cfm references of Portals to Folders
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
Merge pull request #881 from stevewithington/develop

update navbar.cfm references of Portals to Folders
update link to API
Merge pull request #882 from stevewithington/develop

update link to API
Adding configuration defaults
Merge branch 'develop'