edit htaccess.txt to allow for hyphens and underscores in siteid
Merge pull request #1675 from stevewithington/develop

edit htaccess.txt to allow for hyphens and underscores in siteid
add httponly and secure attributes to ckfinder appcfc
Merge pull request #1680 from stevewithington/develop

add httponly and secure attributes to ckfinder appcfc
add secureCookies attribute to settings.ini.cfm template
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
add logic to prevent error from displaying in onApplicationStart only if debuggingenabled=false
Merge pull request #1682 from stevewithington/develop

add secureCookies attribute to settings.ini.cfm template
Remove un-needed ))
Rename tclassextenddatauseractivityuseractivity to tclassextenddatauseractivity
bug fix: cfscripted include on cfkfinder config
Merge branch 'develop' of github.com:stevewithington/MuraCMS into develop
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
Merge pull request #1688 from stevewithington/develop

bug fix: cfscripted include on ckfinder config
Added more version information to menu
Merge pull request #1690 from cameroncf/develop

Added more version information to menu.

Thanks Cameron!
Fixing reference to CF product version
Fixing reference to CF product version
fix for IE/CKFinder
Merge pull request #1693 from stevewithington/develop

fix for IE/CKFinder