no message
Merge branch 'feature/hub_log_viewer' into develop
Merge branch 'sr_develop' into develop

Conflicts:
	plugin.php