Restores changelog.
Merge remote-tracking branch 'opf/feature/rails3' into fix/timelines-api-migration

Conflicts:
	doc/CHANGELOG.md
Merge remote-tracking branch 'opf/fix/timelines-api-migration' into fix/timelines-api-migration

Conflicts:
	doc/CHANGELOG.md