Fixing issue with source image being deleted
Tweaking logic
adding separate toolbar for Form Builder to have more control over content in "Text Blocks"
Merge pull request #1388 from ronnieduke/formbuilder

Thanks for the tweaks.  I'm probably going to revert the <i> back to how it was though it that's the same as it was before.  I had to remove it because it was causing issues duplicating closing </i> over and over again.
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Re-reverting i tag js until more testing is done.
Fixing issue with argument data type
Update lockdown.cfm

This adds the option to use SSL on the lockdown form.

Also uses a /config/settings.ini.cfm property:
lockdownHTTPS=1

If 0, old behavior remains. If 1, will determine the current URL and set the form action to submit via HTTPS.
Merge pull request #1392 from beamerweb/patch-11

Update lockdown.cfm
Fixing issue with orderby
Updating js to not use live
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Fixing issue with named argument
Fixing issue with named argument
Merge branch 'develop' of https://github.com/blueriver/MuraCMS into develop