Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/kukai-detail.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/main.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/kukai-detail.php