testing
fixes
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
clean up
Merge pull request #6 from winkelement/master

hook for single resource edit