Merge branch 'v7' into '7.0.0'

Login page marketing content url updated

See merge request !171

config_override.php

@@ -11,3 +11,6 @@
 //Maximum number of Mailboxes in mail converter
 $max_mailboxes = 3;
 
+//marketing json data url
+$MARKETING_JSON_URL = 'https://marketplace.vtiger.com/api/app/news/MarketingJson.json';
+