Merge commit 'ae76fa880c7aeb7f7b0846dd4b109be8d398018c' into develop

diff --cc mod/simplepie/README
Simple merge

diff --cc mod/simplepie/actions/simplepie/save_group_feed.php
index 0000000000000000000000000000000000000000,8dc2ffd7815bc0947aea9089827db96f47930685..8dc2ffd7815bc0947aea9089827db96f47930685
mode 000000,100644..100644
--- /dev/null
--- 2/actions/simplepie/save_group_feed.php
+++ b/mod/simplepie/actions/simplepie/save_group_feed.php

diff --cc mod/simplepie/languages/en.php
index 07ff029052f9c3c67f742f2e33d3846f6ba969c3,0000000000000000000000000000000000000000..a22316863d3b967c5fca5d52e0351db362980ce2
mode 100644,000000..100644
--- 1/mod/simplepie/languages/en.php
--- /dev/null
+++ b/mod/simplepie/languages/en.php
@@@ -1,16 -1,0 +1,14 @@@
- \r
 +<?php\r
-       'simplepie:notfind' => 'Cannot find feed. Check the feed url.',\r
 +$english = array(\r
 +      'simplepie:widget' => 'RSS Feed',\r
 +      'simplepie:description' => 'Add an external blog to your profile',\r
 +      'simplepie:notset' => 'Feed url is not set',\r
- \r
++      'simplepie:notfound' => 'Cannot find feed. Check the feed url.',\r
 +      'simplepie:feed_url' => 'Feed URL',\r
 +      'simplepie:num_items' => 'Number of items',\r
 +      'simplepie:excerpt' => 'Include excerpt',\r
 +      'simplepie:post_date' => 'Include post date',\r
 +      'simplepie:postedon' => 'Posted on',\r
++      'simplepie:invalid_url' => 'Invalid url, copy it from the navigation bar please',\r
 +);\r
- \r
 +add_translation("en", $english);\r

diff --cc mod/simplepie/languages/es.php
index 0000000000000000000000000000000000000000,d9bd5d2d6faac7f07836b920c24b5b2bb8658bee..d9bd5d2d6faac7f07836b920c24b5b2bb8658bee
mode 000000,100644..100644
--- /dev/null
--- 2/languages/es.php
+++ b/mod/simplepie/languages/es.php

diff --cc mod/simplepie/manifest.xml
Simple merge

diff --cc mod/simplepie/start.php
Simple merge

diff --cc mod/simplepie/views/default/forms/simplepie/save_group_feed.php
index 0000000000000000000000000000000000000000,a3f771586d2fb41143264d1ebd6ea28a625cbdfe..a3f771586d2fb41143264d1ebd6ea28a625cbdfe
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/forms/simplepie/save_group_feed.php
+++ b/mod/simplepie/views/default/forms/simplepie/save_group_feed.php

diff --cc mod/simplepie/views/default/simplepie/group_module.php
index 0000000000000000000000000000000000000000,90c017a869556a3876668d109e024af32fba4007..90c017a869556a3876668d109e024af32fba4007
mode 000000,100644..100644
--- /dev/null
--- 2/views/default/simplepie/group_module.php
+++ b/mod/simplepie/views/default/simplepie/group_module.php