Fixed issue related to wrong setting "from" in notifications. Fixed 'Shortcode Forms' settings view
Merge remote-tracking branch 'upstream/development' into development