Parameter change for function.
Merge branch 'feature/rest_scanned_document' into release/1.2.1-cardiff
Initial stab at using file instead of asset.
Segregated ESB API from main REST controller; added custom esb properties.
Merge branch 'feature/restapi' into feature/asset_renamed_to_file

Conflicts:
	protected/controllers/EsbRestApiController.php
	protected/controllers/RestfulController.php