Merge branch '7.x' of https://github.com/philsogaDGI/sfudora into 7.x-ingest-folder

Conflicts:
	includes/ajaxplorer_ingest.inc
ingest folder
ingest folder
fix ingest collection
remove tmp file and add comments
before the batch solve
add batch to ingest folder
state logging with the folder ingest.
Merge branch '7.x' of https://github.com/philsogaDGI/sfudora into 7.x-ingest-folder

Conflicts:
	includes/ajaxplorer_ingest.inc
	sfudora.module
add collection policy data stream to folder
Merge branch '7.x' of https://github.com/discoverygarden/sfudora into 7.x-ingest-folder
edit pull request 10
Codings standards...
Merge branch '7.x-coding-standards' into HEAD
Add basic menu access check.
Merge pull request #10 from yqjiang/7.x-ingest-folder

7.x ingest folder
fixed merge conflicts