possible coding errors
Merge branch 'develop' into joomla30

Conflicts:
	administrator/components/com_jfusion/jfusion.php
	administrator/components/com_jfusion/models/model.install.php