added citation.pdf to the end of pdf download links
Merge pull request #70 from jordandukart/7.x-update-association

Update form association that was incorrect.
Merge pull request #69 from jbayerdgi/7.x-INT-91

added citation.pdf to the end of pdf download links
Merge branch '7.x' of github.com:discoverygarden/islandora_scholar into 7.x-pdf-changes

Conflicts:
	includes/citation.tab.inc