Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

Conflicts:
	mod/dfrn_poll.php

diff --cc mod/dfrn_poll.php
index 4b25efe418c0b130824aa653f4d13b60e77e0bce,8dd4d31ede1d18594a49e096e1ad3cf296f25a1d..77beabf90434b723941c96900c0d490414bb4385
--- 1/mod/dfrn_poll.php
--- 2/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@@ -445,9 -445,8 +445,9 @@@ function dfrn_poll_content(&$a) 
                                        'sec' => $sec
                                ));
                        }
- 
+                       
                        $profile = $r[0]['nickname'];
 +
                        switch($destination_url) {
                                case 'profile':
                                        $dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile';
@@@ -489,6 -488,7 +489,10 @@@
                                                dbesc($session_id)
                                        ); 
                                }
++<<<<<<< HEAD
++=======
+                               
++>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
                        
                                goaway($dest);
                        }