remove text upper bound, allowing 1.2+ (fixes #207)
resolve conflict
doc: changelogs (resolve conflicts)

Conflicts:
	hledger-lib/CHANGES
	hledger-web/CHANGES
tools: fix tagrelease