Wording change for Link+
Merge branch '20140817-ILL-changes' into staging
Updated the log in page to add links to log in rather than forms

Hopefully this is a temporary page until I can figure out how to embed
a CAS log in page on this server. Also updated the styles to style the
links as buttons.
Changed padding around links.
Merge branch '20140710-loginSSO' into staging

Conflicts:
	services/borrowing/otherlibraries/index.php