increase shibboleth timeout
Merge pull request #3438 from stuartf/shibTimeout

increase shibboleth timeout
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux into bootstrap3
Align .btn-link to baseline in footer to resolve text alignment issue
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux into bootstrap3
Merge branch 'bootstrap3' of git://github.com/bp323/3akai-ux into fix-delete-content-titles
Optimise oae-listitem css