upgrade install doc
upgrade etherpad version (compatible node 0.10)
i18n
- Reindex when we save pad.
- Default pad text is collaboration field text, not description field.
Merge branch 'master' of git://github.com/collective/collective.etherpad

Conflicts:
	buildout.cfg
	collective/etherpad/api.py
	collective/etherpad/archetypes.py
	docs/HISTORY.txt
Added a timeout on api url requests
  so that task is not blocked when we have a network issue.
fixed merge
test setting pad with primary field content
method to generate pad id
Merge pull request #1 from tdesvenain/master

Minor improvements