Merge remote-tracking branch 'opf/feature/rails3' into feature/ie_10_svg_text_rendering

Conflicts:
	doc/CHANGELOG.md
Merge pull request #639 from opf/feature/ie_10_svg_text_rendering
Merge remote-tracking branch 'opf/feature/rails3' into feature/timelines-render-bucket-size

Conflicts:
	doc/CHANGELOG.md