merge local version
Merge branch 'master' of
https://github.com/johker-wst/com_kunenaimporter

Conflicts:
	administrator/components/com_kunenaimporter/models/export_phpbb3.php