#1529 J3.2+ : keep the tab selected by user when do an action on button
Merge pull request #2128 from xillibit/k30_bugs12

#1529 J3.2+ : keep the tab selected by user when do an action on button
#2105 RSS : only topics are generated (Part 2)
Merge pull request #2132 from xillibit/k30_bugs11

#2105 RSS : only topics are generated (Part 2)
Merge branches 'feature-hmvc' and 'master' of github.com:Kunena/Kunena-Forum into feature-hmvc
#2130 J! 3.2.0 + K 3.0.3: Kunena Template Manager does not filter users
Fix #2138: JomSocial rule file is not copied to the site
Merge branch 'master' of github.com:Kunena/Kunena-Forum
Revert #2088: It breaks layout in a few tested templates (second try)
#2144 J 3.1+ Trash Manager - Restore Items : Error Undefined index
Add a config option to choose if the stats link can be showed for guests
#2137 Search: Cannot use variable ?q=xxx in nginx
Merge pull request #2136 from xillibit/k30_bugs12

#2130 J! 3.2.0 + K 3.0.3: Kunena Template Manager does not filter users
Merge pull request #2148 from xillibit/k30_bugs3

#2137 Search: Cannot use variable ?q=xxx in nginx
Merge pull request #2145 from xillibit/k30_bugs6

#2144 J 3.1+ Trash Manager - Restore Items : Error Undefined index
Merge pull request #2103 from xillibit/k30_bugs4

Add a config option to choose if the stats link can be showed for guests
Merge branch 'master' of github.com:Kunena/Kunena-Forum
Merge pull request #2151 from mahagr/master

Fix #2138: JomSocial rule file is not copied to the site, Revert #2088 (try 2)
Merge branch 'feature-hmvc' of github.com:Kunena/Kunena-Forum into feature-hmvc
Merge branch 'master' of github.com:Kunena/Kunena-Forum into feature-hmvc

Conflicts:
	components/com_kunena/admin/kunena.xml
	components/com_kunena/site/language/en-GB/en-GB.com_kunena.ini
	libraries/kunena/config.php
	libraries/kunena/route/route.php