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 bootstrap3