Merge branch 'develop' into 'master'

Version 1.1.1

See merge request framasoft/framadate!292

app/inc/constants.php

@@ -18,7 +18,7 @@
  */
 
 // FRAMADATE version
-const VERSION = '1.1.0';
+const VERSION = '1.1.1';
 
 // PHP Needed version
 const PHP_NEEDED_VERSION = '5.6';

tpl/mail/remember_edit_link.tpl

 <h1>{$poll->title|html|string_format:__('EditLink', 'Edit link for poll "%s"')}</h1>
 <p>
     {__('EditLink', 'Here is the link for editing your vote:')}
-    <a href="{poll_url id=$poll->admin_id vote_id=$editedVoteUniqueId}">{$poll->title|html}</a>
-</p>
\ No newline at end of file
+    <a href="{poll_url id=$poll_id vote_id=$editedVoteUniqueId}">{$poll->title|html}</a>
+</p>