increase shibboleth timeout
Typo in config: mixing /etherpad/0 and /etherpad/1
Changes from the presentation by mrvisser

Needed these changes to get etherpad wordking

Added:
proxy_read_timeout 60;
Removed:
proxy_redirect off;
Changed order of the /api/push/ and /api

Needed this to fix etherpad: the /api was first, so the
/api/push/ location does not get applied.
Merge pull request #3444 from EdiaEducationTechnology/master

Changes in nginx.conf to get etherpad working
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux into structureCasperjs
Merge pull request #3438 from stuartf/shibTimeout

increase shibboleth timeout
Refresh the content signature on 401 responses on page previews
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux into structureCasperjs
Align .btn-link to baseline in footer to resolve text alignment issue
Toggle icon when documentpreviewer is fullscreen
Add back new line in documentpreview.js
Merge remote-tracking branch 'simong/content-signature-pages'
Follow op on signature refresh in documentpreview
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux into structureCasperjs