Merge pull request #1769 from mahagr/feature-crypsis

Merge changes from develop branch
J3.0 Administration: Fatal error in diagnostics page
Merge remote-tracking branch 'origin/master'

Conflicts:
	components/com_kunena/admin/template/joomla25/tools/diagnostics.php
Admin tools: Fix aliases during category recount
Fix #1745: Preview link doesn't have menu item
Fix #1760: No categories are shown on first visit
Merge pull request #1776 from mahagr/master

Fix #1745, #1760, fatal error in diagnostics & fix aliased during category recount
Missing userid in links to go to jomsocial userprofile
Fix broken BBCode and some legacy BBCode issues derived from PHP4 support.
Merge branch 'master' of git://github.com/Kunena/Kunena-Forum
Merge pull request #1782 from coder4life/master

BBCode fix.
Merge pull request #1781 from xillibit/k30_bugs10

Missing userid in links to go to jomsocial userprofile
Fix #1779: Revert JEventDispatcher to JDispatcher (J2.5)
Fix #1778: Log only errors and delete log file on installation
Merge pull request #1785 from mahagr/master

Fix #1779, #1778
Merge branch 'master' of github.com:Kunena/Kunena-Forum into feature-hmvc
Merge branch 'feature-crypsis' of github.com:Kunena/Kunena-Forum into feature-hmvc
Move template layouts one level up