Merge branch 'release/v2.8.4' into develop
Fixed a PHP notice.
Added a custom short code parser that will prevent other plugins from tampering with email and success message ninja forms short codes.
Updating to version 2.8.4.
Merge branch 'release/v2.8.4'