Merge pull request #1654 from stevewithington/candidate

userui updates
Tweaking how csrf tokens expire in order to about percision errors
Tweaking how csrf tokens expire in order to about percision errors
fixing the long broken nested comments
Merge branch 'candidate' of https://github.com/blueriver/MuraCMS into candidate
Merge pull request #1655 from ronnieduke/candidate

Bringing nested comments back to life
Removing railo check
Breaking up how custom image previews are loaded
add new autopreviewimages settings.ini.cfm attribute
Breaking up how custom image previews are loaded
add new autopreviewimages settings.ini.cfm attribute
Merge branch 'candidate' of github.com:blueriver/MuraCMS into candidate
Removing getFiles from restricted options