not bubling permissions
documenting some hooks
Fix TOKEN_TIMEOUT constant.
test working again
Merge pull request #376 from willtp87/7.x.tn_fix

not bubling permissions
Carry through changes.
Add some examples.
Fixed links not working if Drupal is in a subfolder (e.g.: multi-site).
Merge pull request #383 from adam-vessey/7.x-better-drush-examples

Add some examples.
Removed prefixed slashes that caused links to break.
Fixed link to print image not being formed correctly.
Merge pull request #379 from willtp87/7.x.api_docs

documenting some hooks
Merge pull request #385 from christianselig/7.x-print-fix

Fixed links not working if Drupal is in a subfolder (e.g.: multi-site).
Merge pull request #382 from adam-vessey/7.x-constants

Update constants to fit new coding standards from coder.
Merge branch '7.x' of github.com:Islandora/islandora into 7.x-derivatives

Conflicts:
	islandora.api.php