updates for frontend editing
Merge branch 'master' of https://github.com/inboundnow/calls-to-action
function tool for template tags
Merge branch 'master' of https://github.com/inboundnow/calls-to-action

Conflicts:
	modules/module.calls-to-action.php
	modules/module.widgets.php
temp color option for function testing