Simplify footer links
Fix e2e tests
Merge branch 'master' into socketio
Update e2e test to work in all branches
Merge branch 'master' into socketio