finding hook for single resource edit
Merge origin/master

Conflicts:
	include/ocrstream_functions.php
	pages/setup.php
Merge origin/master

Conflicts:
	include/ocrstream_functions.php
	pages/setup.php